[Rt-commit] rt branch, master, updated. rt-4.1.13-282-g521a43f

[Kevin Falcone]

The branch, master has been updated
       via  521a43f73b0d25b02460938d90c201be7e25cc97 (commit)
       via  165a4bcf2b98dc5df6658f7f14e0a9113ae45ae6 (commit)
      from  1790650ad9872cf689c5d4e998f197f063df44fb (commit)

Summary of changes:
 docs/UPGRADING-4.2                                 | 12 ++++++
 docs/authentication.pod                            | 26 +++++------
 etc/RT_Config.pm.in                                | 50 +++++++++++-----------
 lib/RT/Config.pm                                   |  6 +++
 lib/RT/Interface/Web.pm                            | 34 +++++++--------
 lib/RT/User.pm                                     |  4 +-
 share/html/Elements/Login                          |  2 +-
 share/html/Elements/Tabs                           |  8 ++--
 .../Deauthorized                                   |  0
 .../NoInternalUser                                 |  0
 .../NoRemoteUser                                   |  0
 .../UserAutocreateDefaultsOnLogin}                 |  0
 .../{WebExternalAuth => WebRemoteUser}/Wrapper     |  4 +-
 share/html/m/_elements/login                       |  2 +-
 t/web/basic_auth.t                                 |  4 +-
 t/web/redirect-after-login.t                       |  2 +-
 t/web/remote_user.t                                | 32 +++++++-------
 17 files changed, 103 insertions(+), 83 deletions(-)
 rename share/html/Errors/{WebExternalAuth => WebRemoteUser}/Deauthorized (100%)
 rename share/html/Errors/{WebExternalAuth => WebRemoteUser}/NoInternalUser (100%)
 rename share/html/Errors/{WebExternalAuth => WebRemoteUser}/NoRemoteUser (100%)
 rename share/html/Errors/{WebExternalAuth/AutoCreate => WebRemoteUser/UserAutocreateDefaultsOnLogin} (100%)
 rename share/html/Errors/{WebExternalAuth => WebRemoteUser}/Wrapper (95%)

- Log -----------------------------------------------------------------
commit 521a43f73b0d25b02460938d90c201be7e25cc97
Merge: 1790650 165a4bc
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Jul 8 12:25:47 2013 -0400

    Merge branch '4.2/rename-external-auth'
    
    Conflicts:
    	docs/UPGRADING-4.2
    	lib/RT/Config.pm

diff --cc docs/UPGRADING-4.2
index 87d7a87,fb3cfd4..c63921c
--- a/docs/UPGRADING-4.2
+++ b/docs/UPGRADING-4.2
@@@ -130,16 -130,14 +130,28 @@@ UPGRADING FROM RT 4.0.0 and greate
    performance problems.  Unprivileged Owners (if they exist) may still
    be set using the Autocompleter.
  
 +* New installs will notify Ccs and one-time Ccs/Bccs on create and Owners on
 +  create and correspond.  Upgraded installations will not.  If you'd like to
 +  adjust your scrips, the actions are available from the admin scrip pages.
 +
 +* Notifications to AdminCcs on approvals are now handled via the New Pending
 +  Approval template in the hidden ___Approvals queue.  If you customized the
 +  Transaction template, you should port your changes to New Pending Approval.
 +
 +* On Oracle, sessions are now stored in the database by default instead of
 +  on-disk.  If you wish to preserve the original behaviour, ensure the
 +  following is in your RT_SiteConfig.pm:
 +
 +    Set($WebSessionClass, "Apache::Session::File");
++
+ * Configuration options dealing with "external authentication" have been
+   renamed to reduce confusion with the common extension
+   RT::Authen::ExternalAuth.  The old names will work, but produce
+   deprecation warnings.  The old names, and their new counterparts, are:
+ 
+       WebExternalAuth           => WebRemoteUserAuth
+       WebExternalAuthContinuous => WebRemoteUserContinuous
+       WebFallbackToInternalAuth => WebFallbackToRTLogin
+       WebExternalGecos          => WebRemoteUserGecos
+       WebExternalAuto           => WebRemoteUserAutocreate
+       AutoCreate                => UserAutocreateDefaultsOnLogin
diff --cc lib/RT/Config.pm
index 59c7276,cf48773..7e2faae
--- a/lib/RT/Config.pm
+++ b/lib/RT/Config.pm
@@@ -821,9 -821,12 +821,15 @@@ our %META = 
              $config->Set( CustomFieldGroupings => %$groups );
          },
      },
 +    ChartColors => {
 +        Type    => 'ARRAY',
 +    },
+     WebExternalAuth           => { Deprecated => { Instead => 'WebRemoteUserAuth',             Remove => '4.4' }},
+     WebExternalAuthContinuous => { Deprecated => { Instead => 'WebRemoteUserContinuous',       Remove => '4.4' }},
+     WebFallbackToInternalAuth => { Deprecated => { Instead => 'WebFallbackToRTLogin',          Remove => '4.4' }},
+     WebExternalGecos          => { Deprecated => { Instead => 'WebRemoteUserGecos',            Remove => '4.4' }},
+     WebExternalAuto           => { Deprecated => { Instead => 'WebRemoteUserAutocreate',       Remove => '4.4' }},
+     AutoCreate                => { Deprecated => { Instead => 'UserAutocreateDefaultsOnLogin', Remove => '4.4' }},
  );
  my %OPTIONS = ();
  my @LOADED_CONFIGS = ();

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