aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/modules/ucp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-12-27 12:18:04 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-12-27 12:18:04 +0000
commit25725c98503c3a9ba8b5de4b91c2528b6c974a03 (patch)
treeadf5470b0a4f90ef44b9be7a9761c4a6153072aa /phpBB/modules/ucp
parent297af28a40e5fa94de0cb2f57d807b39020f44f0 (diff)
downloadforums-25725c98503c3a9ba8b5de4b91c2528b6c974a03.tar
forums-25725c98503c3a9ba8b5de4b91c2528b6c974a03.tar.gz
forums-25725c98503c3a9ba8b5de4b91c2528b6c974a03.tar.bz2
forums-25725c98503c3a9ba8b5de4b91c2528b6c974a03.tar.xz
forums-25725c98503c3a9ba8b5de4b91c2528b6c974a03.zip
replace constants with class constants.
ACL_YES, ACL_NO, ACL_NEVER, USER_NORMAL, USER_IGNORE, USER_INACTIVE, USER_FOUNDER git-svn-id: file:///svn/phpbb/trunk@9233 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/modules/ucp')
-rw-r--r--phpBB/modules/ucp/ucp_activate.php2
-rw-r--r--phpBB/modules/ucp/ucp_groups.php2
-rw-r--r--phpBB/modules/ucp/ucp_pm_compose.php2
-rw-r--r--phpBB/modules/ucp/ucp_profile.php4
-rw-r--r--phpBB/modules/ucp/ucp_register.php6
-rw-r--r--phpBB/modules/ucp/ucp_remind.php4
-rw-r--r--phpBB/modules/ucp/ucp_resend.php6
-rw-r--r--phpBB/modules/ucp/ucp_zebra.php4
8 files changed, 15 insertions, 15 deletions
diff --git a/phpBB/modules/ucp/ucp_activate.php b/phpBB/modules/ucp/ucp_activate.php
index 594e346310..bc4618f5fd 100644
--- a/phpBB/modules/ucp/ucp_activate.php
+++ b/phpBB/modules/ucp/ucp_activate.php
@@ -44,7 +44,7 @@ class ucp_activate
trigger_error('NO_USER');
}
- if ($user_row['user_type'] <> USER_INACTIVE && !$user_row['user_newpasswd'])
+ if ($user_row['user_type'] <> phpbb::USER_INACTIVE && !$user_row['user_newpasswd'])
{
meta_refresh(3, append_sid('index'));
trigger_error('ALREADY_ACTIVATED');
diff --git a/phpBB/modules/ucp/ucp_groups.php b/phpBB/modules/ucp/ucp_groups.php
index 0c4a5dca31..67e6fdb9ea 100644
--- a/phpBB/modules/ucp/ucp_groups.php
+++ b/phpBB/modules/ucp/ucp_groups.php
@@ -429,7 +429,7 @@ class ucp_groups
}
// Check if the user is allowed to manage this group if set to founder only.
- if ($user->data['user_type'] != USER_FOUNDER && $group_row['group_founder_manage'])
+ if ($user->data['user_type'] != phpbb::USER_FOUNDER && $group_row['group_founder_manage'])
{
trigger_error($user->lang['NOT_ALLOWED_MANAGE_GROUP'] . $return_page, E_USER_WARNING);
}
diff --git a/phpBB/modules/ucp/ucp_pm_compose.php b/phpBB/modules/ucp/ucp_pm_compose.php
index ac9a4076cb..d81f5287eb 100644
--- a/phpBB/modules/ucp/ucp_pm_compose.php
+++ b/phpBB/modules/ucp/ucp_pm_compose.php
@@ -1147,7 +1147,7 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
if (sizeof($usernames))
{
$user_id_ary = array();
- user_get_id_name($user_id_ary, $usernames, array(USER_NORMAL, USER_FOUNDER, USER_INACTIVE));
+ user_get_id_name($user_id_ary, $usernames, array(phpbb::USER_NORMAL, phpbb::USER_FOUNDER, phpbb::USER_INACTIVE));
// If there are users not existing, we will at least print a notice...
if (!sizeof($user_id_ary))
diff --git a/phpBB/modules/ucp/ucp_profile.php b/phpBB/modules/ucp/ucp_profile.php
index 626fb8023d..cdae16b6f4 100644
--- a/phpBB/modules/ucp/ucp_profile.php
+++ b/phpBB/modules/ucp/ucp_profile.php
@@ -133,7 +133,7 @@ class ucp_profile
$message = 'PROFILE_UPDATED';
- if ($config['email_enable'] && $data['email'] != $user->data['user_email'] && $user->data['user_type'] != USER_FOUNDER && ($config['require_activation'] == USER_ACTIVATION_SELF || $config['require_activation'] == USER_ACTIVATION_ADMIN))
+ if ($config['email_enable'] && $data['email'] != $user->data['user_email'] && $user->data['user_type'] != phpbb::USER_FOUNDER && ($config['require_activation'] == USER_ACTIVATION_SELF || $config['require_activation'] == USER_ACTIVATION_ADMIN))
{
$message = ($config['require_activation'] == USER_ACTIVATION_SELF) ? 'ACCOUNT_EMAIL_CHANGED' : 'ACCOUNT_EMAIL_CHANGED_ADMIN';
@@ -172,7 +172,7 @@ class ucp_profile
$admin_ary = (!empty($admin_ary[0]['a_user'])) ? $admin_ary[0]['a_user'] : array();
// Also include founders
- $where_sql = ' WHERE user_type = ' . USER_FOUNDER;
+ $where_sql = ' WHERE user_type = ' . phpbb::USER_FOUNDER;
if (sizeof($admin_ary))
{
diff --git a/phpBB/modules/ucp/ucp_register.php b/phpBB/modules/ucp/ucp_register.php
index b9ba1246ea..55f75bd9fb 100644
--- a/phpBB/modules/ucp/ucp_register.php
+++ b/phpBB/modules/ucp/ucp_register.php
@@ -277,13 +277,13 @@ class ucp_register
$key_len = ($key_len < 6) ? 6 : $key_len;
$user_actkey = substr($user_actkey, 0, $key_len);
- $user_type = USER_INACTIVE;
+ $user_type = phpbb::USER_INACTIVE;
$user_inactive_reason = INACTIVE_REGISTER;
$user_inactive_time = time();
}
else
{
- $user_type = USER_NORMAL;
+ $user_type = phpbb::USER_NORMAL;
$user_actkey = '';
$user_inactive_reason = 0;
$user_inactive_time = 0;
@@ -375,7 +375,7 @@ class ucp_register
$admin_ary = (!empty($admin_ary[0]['a_user'])) ? $admin_ary[0]['a_user'] : array();
// Also include founders
- $where_sql = ' WHERE user_type = ' . USER_FOUNDER;
+ $where_sql = ' WHERE user_type = ' . phpbb::USER_FOUNDER;
if (sizeof($admin_ary))
{
diff --git a/phpBB/modules/ucp/ucp_remind.php b/phpBB/modules/ucp/ucp_remind.php
index db4b3c8fcc..550051ae18 100644
--- a/phpBB/modules/ucp/ucp_remind.php
+++ b/phpBB/modules/ucp/ucp_remind.php
@@ -48,12 +48,12 @@ class ucp_remind
trigger_error('NO_EMAIL_USER');
}
- if ($user_row['user_type'] == USER_IGNORE)
+ if ($user_row['user_type'] == phpbb::USER_IGNORE)
{
trigger_error('NO_USER');
}
- if ($user_row['user_type'] == USER_INACTIVE)
+ if ($user_row['user_type'] == phpbb::USER_INACTIVE)
{
if ($user_row['user_inactive_reason'] == INACTIVE_MANUAL)
{
diff --git a/phpBB/modules/ucp/ucp_resend.php b/phpBB/modules/ucp/ucp_resend.php
index fef6decf4a..38b333a5a4 100644
--- a/phpBB/modules/ucp/ucp_resend.php
+++ b/phpBB/modules/ucp/ucp_resend.php
@@ -55,17 +55,17 @@ class ucp_resend
trigger_error('NO_EMAIL_USER');
}
- if ($user_row['user_type'] == USER_IGNORE)
+ if ($user_row['user_type'] == phpbb::USER_IGNORE)
{
trigger_error('NO_USER');
}
- if (!$user_row['user_actkey'] && $user_row['user_type'] != USER_INACTIVE)
+ if (!$user_row['user_actkey'] && $user_row['user_type'] != phpbb::USER_INACTIVE)
{
trigger_error('ACCOUNT_ALREADY_ACTIVATED');
}
- if (!$user_row['user_actkey'] || ($user_row['user_type'] == USER_INACTIVE && $user_row['user_inactive_reason'] == INACTIVE_MANUAL))
+ if (!$user_row['user_actkey'] || ($user_row['user_type'] == phpbb::USER_INACTIVE && $user_row['user_inactive_reason'] == INACTIVE_MANUAL))
{
trigger_error('ACCOUNT_DEACTIVATED');
}
diff --git a/phpBB/modules/ucp/ucp_zebra.php b/phpBB/modules/ucp/ucp_zebra.php
index 6ba168a53c..a928e9985a 100644
--- a/phpBB/modules/ucp/ucp_zebra.php
+++ b/phpBB/modules/ucp/ucp_zebra.php
@@ -114,13 +114,13 @@ class ucp_zebra
$sql = 'SELECT user_id, user_type
FROM ' . USERS_TABLE . '
WHERE ' . $db->sql_in_set('username_clean', $data['add']) . '
- AND user_type <> ' . USER_INACTIVE;
+ AND user_type <> ' . phpbb::USER_INACTIVE;
$result = $db->sql_query($sql);
$user_id_ary = array();
while ($row = $db->sql_fetchrow($result))
{
- if ($row['user_id'] != ANONYMOUS && $row['user_type'] != USER_IGNORE)
+ if ($row['user_id'] != ANONYMOUS && $row['user_type'] != phpbb::USER_IGNORE)
{
$user_id_ary[] = $row['user_id'];
}
generated by cgit v1.2.1 (git 2.21.0) at 2025-02-20 06:19:51 +0000