From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 10 May 2013 19:55:52 +0000 (-0700)
Subject: merge NG auth, RT#21563
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=63973c641c4be00765fa27e55c57cc5b9aa4da19

merge NG auth, RT#21563
---

63973c641c4be00765fa27e55c57cc5b9aa4da19
diff --cc FS/FS/UI/Web.pm
index c8ad430b2,c11e6c951..f63854ca0
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@@ -581,8 -578,8 +581,8 @@@ use vars qw($DEBUG)
  use Carp;
  use Storable qw(nfreeze);
  use MIME::Base64;
 -use JSON;
 +use JSON::XS;
- use FS::UID qw(getotaker);
+ use FS::CurrentUser;
  use FS::Record qw(qsearchs);
  use FS::queue;
  use FS::CGI qw(rooturl);
diff --cc FS/MANIFEST
index 94232905e,d2b7013a4..ee184071e
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@@ -688,5 -690,5 +692,7 @@@ FS/part_pkg_usage.p
  t/part_pkg_usage.t
  FS/cdr_cust_pkg_usage.pm
  t/cdr_cust_pkg_usage.t
 +FS/part_pkg_msgcat.pm
 +t/part_pkg_msgcat.t
+ FS/access_user_session.pm
+ t/access_user_session.t