[freeside-commits] branch master updated. 63973c641c4be00765fa27e55c57cc5b9aa4da19

Ivan ivan at 420.am
Fri May 10 12:56:10 PDT 2013


The branch, master has been updated
       via  63973c641c4be00765fa27e55c57cc5b9aa4da19 (commit)
       via  0832972047a36d19ffcf7d1462abc48de7045d3d (commit)
       via  56f9dffcd409d2a10e7a2cbe4c15b397f6f3abe1 (commit)
       via  19eef2ec0e68587304cd597fc5b2f8e1f151e424 (commit)
       via  076ddfe0b0e764636e8389edebaedddef0fbf003 (commit)
       via  120718856665ca90ad852535d1155f8ea8ecb6b6 (commit)
       via  d8843f184a7f6ee87eec99724f2d6430c1df34ea (commit)
       via  f744f757a01e1750afa55072c7208714f16d1d13 (commit)
       via  56094325213b403e787bbfce7f3db7870b707173 (commit)
       via  9732b34df2fad5f09751766378c05eacd671e4fb (commit)
       via  d139a46390d127753877e8e55766e864df788d0b (commit)
       via  199450cf528a5ac6b4fe739c38f9adf99a913712 (commit)
       via  92a3df0360d3df6b6ace99fee3d4cc443e6154d0 (commit)
       via  9d35792778885932c09102bd011b518eb47c5131 (commit)
       via  5c898c621e1343f8c116a75ca3131eb78229e09b (commit)
       via  e62544064299324ab04abae64cc33afef12a24aa (commit)
       via  3ff1fb4e10fdaef86527c10bd416e988d2a62a49 (commit)
       via  b70a4b7f41c84aefd7f273974db59e5c37fc368b (commit)
       via  24dee535417570307d82c5f5302c116dec9cf21f (commit)
      from  7b5a266236857fbb4bbf8d4ac3031c3fec75cac2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 63973c641c4be00765fa27e55c57cc5b9aa4da19
Merge: 7b5a266 0832972
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri May 10 12:55:52 2013 -0700

    merge NG auth, RT#21563

diff --cc FS/FS/UI/Web.pm
index c8ad430,c11e6c9..f63854c
--- 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 9423290,d2b7013..ee18407
--- 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

-----------------------------------------------------------------------

Summary of changes:
 FS/FS.pm                                        |    2 +
 FS/FS/Auth.pm                                   |   25 +++
 FS/FS/Auth/external.pm                          |    9 +
 FS/FS/Auth/internal.pm                          |   78 ++++++++
 FS/FS/Auth/legacy.pm                            |   27 +++
 FS/FS/AuthCookieHandler.pm                      |   46 +++++
 FS/FS/CGI.pm                                    |    6 +-
 FS/FS/Conf.pm                                   |   15 ++
 FS/FS/CurrentUser.pm                            |  125 ++++++++++++-
 FS/FS/Mason.pm                                  |    2 +-
 FS/FS/Mason/Request.pm                          |   33 ++--
 FS/FS/Record.pm                                 |   13 +-
 FS/FS/Schema.pm                                 |   32 +++-
 FS/FS/UI/Web.pm                                 |    4 +-
 FS/FS/UID.pm                                    |  163 +++++++----------
 FS/FS/access_user.pm                            |   90 ++++------
 FS/FS/access_user_session.pm                    |  158 ++++++++++++++++
 FS/FS/banned_pay.pm                             |    1 -
 FS/FS/cust_credit.pm                            |    2 +-
 FS/FS/cust_credit_bill.pm                       |    1 -
 FS/FS/cust_main.pm                              |    2 +-
 FS/FS/cust_main/Status.pm                       |    5 +-
 FS/FS/cust_pay.pm                               |    1 -
 FS/FS/cust_pay_refund.pm                        |    1 -
 FS/FS/cust_pay_void.pm                          |    1 -
 FS/FS/cust_pkg.pm                               |    2 +-
 FS/FS/cust_refund.pm                            |    1 -
 FS/MANIFEST                                     |    6 +
 FS/bin/freeside-setup                           |    2 +-
 FS/bin/freeside-upgrade                         |    2 +-
 FS/t/access_user_session.t                      |    5 +
 Makefile                                        |    1 -
 bin/fs-migrate-svc_acct_sm                      |  227 -----------------------
 bin/fs-radius-add-check                         |    8 +-
 bin/fs-radius-add-reply                         |    8 +-
 eg/Auth-my_external_auth.pm                     |   28 +++
 htetc/freeside-base2.conf                       |   54 ++++--
 htetc/htpasswd.logout                           |    1 -
 httemplate/autohandler                          |    2 +-
 httemplate/edit/access_user.html                |   10 +-
 httemplate/edit/cust_credit.cgi                 |    2 -
 httemplate/edit/cust_main.cgi                   |    1 -
 httemplate/edit/elements/ApplicationCommon.html |    2 -
 httemplate/edit/process/access_user.html        |   28 ++-
 httemplate/edit/process/elements/process.html   |    9 +-
 httemplate/edit/svc_acct.cgi                    |    2 -
 httemplate/edit/svc_cert.cgi                    |    2 -
 httemplate/edit/svc_domain.cgi                  |    2 -
 httemplate/elements/header.html                 |   31 ++--
 httemplate/elements/logout.html                 |   44 -----
 httemplate/index.html                           |    2 +-
 httemplate/loginout/login.html                  |   71 +++++++
 httemplate/loginout/logout.html                 |   31 ++--
 httemplate/pref/pref-process.html               |   35 ++--
 httemplate/pref/pref.html                       |   36 ++--
 55 files changed, 890 insertions(+), 607 deletions(-)
 create mode 100644 FS/FS/Auth.pm
 create mode 100644 FS/FS/Auth/external.pm
 create mode 100644 FS/FS/Auth/internal.pm
 create mode 100644 FS/FS/Auth/legacy.pm
 create mode 100644 FS/FS/AuthCookieHandler.pm
 create mode 100644 FS/FS/access_user_session.pm
 create mode 100644 FS/t/access_user_session.t
 delete mode 100755 bin/fs-migrate-svc_acct_sm
 create mode 100644 eg/Auth-my_external_auth.pm
 delete mode 100644 htetc/htpasswd.logout
 delete mode 100644 httemplate/elements/logout.html
 create mode 100644 httemplate/loginout/login.html




More information about the freeside-commits mailing list