aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/constants.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-05-02 15:54:10 +0200
committerNils Adermann <naderman@naderman.de>2014-05-02 15:54:10 +0200
commit97e651a4917778bd4294073d254c8735b7b1f4df (patch)
tree6fb005f38a35a2ebd2388300df5f79312deb4865 /phpBB/includes/constants.php
parentd52c2d1b5caf1382d178e55eff311ceddf4b392f (diff)
parentd14aed0819f2314ab0da1787aa7228025a6a024c (diff)
downloadforums-97e651a4917778bd4294073d254c8735b7b1f4df.tar
forums-97e651a4917778bd4294073d254c8735b7b1f4df.tar.gz
forums-97e651a4917778bd4294073d254c8735b7b1f4df.tar.bz2
forums-97e651a4917778bd4294073d254c8735b7b1f4df.tar.xz
forums-97e651a4917778bd4294073d254c8735b7b1f4df.zip
Merge remote-tracking branch 'github-exreaction/ticket/8323' into develop-ascraeus
* github-exreaction/ticket/8323: [ticket/8323] Cache auth request [ticket/8323] Combine into a single query [ticket/8323] Comments on phpbb_get_banned_user_ids input for test [ticket/8323] More readability in test case [ticket/8323] Comments [ticket/8323] dataProvider for the test; better test data [ticket/8323] Comments [ticket/8323] Unit test for phpbb_get_banned_user_ids [ticket/8323] Comments for inactive reasons in constants.php [ticket/8323] Only disable administrative deactivated accounts from receiving PMs [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification [ticket/8323] Correct PM notification settings (only notify those who can receive them) [ticket/8323] Cleanup viewtopic code (not sure how this mess happened) [ticket/8323] Allow sending PMs to temporarily banned users [ticket/8323] Do not allow sending PMs to Inactive users [ticket/8323] Hide the Send PM link if users cannot receive the PM [ticket/8323] Correcting the comment [ticket/8323] Do not allow sending of Private Messages to users who are banned [ticket/8323] Remove code used for testing [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages Conflicts: phpBB/language/en/ucp.php
Diffstat (limited to 'phpBB/includes/constants.php')
-rw-r--r--phpBB/includes/constants.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index a59b4a8add..66d2e4bd81 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -46,10 +46,10 @@ define('USER_INACTIVE', 1);
define('USER_IGNORE', 2);
define('USER_FOUNDER', 3);
-define('INACTIVE_REGISTER', 1);
-define('INACTIVE_PROFILE', 2);
-define('INACTIVE_MANUAL', 3);
-define('INACTIVE_REMIND', 4);
+define('INACTIVE_REGISTER', 1); // Newly registered account
+define('INACTIVE_PROFILE', 2); // Profile details changed
+define('INACTIVE_MANUAL', 3); // Account deactivated by administrator
+define('INACTIVE_REMIND', 4); // Forced user account reactivation
// ACL
define('ACL_NEVER', 0);