aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-03-30 14:24:55 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-03-30 14:24:55 +0000
commitefcb1279f06d1016c25fae516158abdb895981ee (patch)
treed2132ac5293103c1434c7f17133c7df453e45e78 /phpBB/includes
parent9f82dec04b18813c060e5a090a149c1a2c140689 (diff)
downloadforums-efcb1279f06d1016c25fae516158abdb895981ee.tar
forums-efcb1279f06d1016c25fae516158abdb895981ee.tar.gz
forums-efcb1279f06d1016c25fae516158abdb895981ee.tar.bz2
forums-efcb1279f06d1016c25fae516158abdb895981ee.tar.xz
forums-efcb1279f06d1016c25fae516158abdb895981ee.zip
other fixes...
git-svn-id: file:///svn/phpbb/trunk@7242 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions.php2
-rw-r--r--phpBB/includes/functions_display.php2
-rw-r--r--phpBB/includes/functions_jabber.php2
-rw-r--r--phpBB/includes/functions_posting.php2
-rw-r--r--phpBB/includes/functions_privmsgs.php2
-rw-r--r--phpBB/includes/mcp/mcp_queue.php4
-rwxr-xr-xphpBB/includes/mcp/mcp_reports.php2
-rw-r--r--phpBB/includes/ucp/ucp_groups.php8
-rw-r--r--phpBB/includes/ucp/ucp_pm_compose.php2
9 files changed, 14 insertions, 12 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index acd7f4469e..184da5c6fd 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2083,7 +2083,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
{
$redirect = request_var('redirect', "{$phpbb_root_path}index.$phpEx");
$message = ($l_success) ? $l_success : $user->lang['LOGIN_REDIRECT'];
- $l_redirect = ($admin) ? $user->lang['PROCEED_TO_ACP'] : (($redirect === "{$phpbb_root_path}index.$phpEx") ? $user->lang['RETURN_INDEX'] : $user->lang['RETURN_PAGE']);
+ $l_redirect = ($admin) ? $user->lang['PROCEED_TO_ACP'] : (($redirect === "{$phpbb_root_path}index.$phpEx" || $redirect === "index.$phpEx") ? $user->lang['RETURN_INDEX'] : $user->lang['RETURN_PAGE']);
// append/replace SID (may change during the session for AOL users)
$redirect = reapply_sid($redirect);
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index fe9ca63046..7ce01571f8 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -164,7 +164,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
$active_forum_ary['forum_topics'] += ($auth->acl_get('m_approve', $forum_id)) ? $row['forum_topics_real'] : $row['forum_topics'];
$active_forum_ary['forum_posts'] += $row['forum_posts'];
- // If this is a passworded forum we do not show active topics from it if the user is not authorized to view it...
+ // If this is a passworded forum we do not show active topics from it if the user is not authorised to view it...
if ($row['forum_password'] && $row['user_id'] != $user->data['user_id'])
{
$active_forum_ary['exclude_forum_id'][] = $forum_id;
diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php
index 184a1f89a4..3872346bbc 100644
--- a/phpBB/includes/functions_jabber.php
+++ b/phpBB/includes/functions_jabber.php
@@ -91,7 +91,7 @@ class jabber
$this->error_codes = array(
400 => 'Bad Request',
- 401 => 'Unauthorized',
+ 401 => 'Unauthorised',
402 => 'Payment Required',
403 => 'Forbidden',
404 => 'Not Found',
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 67aedc2f25..b7ac1b3ac3 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1201,7 +1201,7 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id
$db->sql_query($sql);
}
- // Now delete the user_ids not authorized to receive notifications on this topic/forum
+ // Now delete the user_ids not authorised to receive notifications on this topic/forum
if (!empty($delete_ids['topic']))
{
$sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . "
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 54ef426ca4..5ff4324904 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -778,7 +778,7 @@ function move_pm($user_id, $message_limit, $move_msg_ids, $dest_folder, $cur_fol
if (!$row)
{
- trigger_error('NOT_AUTHORIZED');
+ trigger_error('NOT_AUTHORISED');
}
if ($row['pm_count'] + sizeof($move_msg_ids) > $message_limit)
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 0367092726..673e65dd58 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -401,7 +401,7 @@ function approve_post($post_id_list, $id, $mode)
if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
{
- trigger_error('NOT_AUTHORIZED');
+ trigger_error('NOT_AUTHORISED');
}
$redirect = request_var('redirect', build_url(array('_f_', 'quickmod')));
@@ -645,7 +645,7 @@ function disapprove_post($post_id_list, $id, $mode)
if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
{
- trigger_error('NOT_AUTHORIZED');
+ trigger_error('NOT_AUTHORISED');
}
$redirect = request_var('redirect', build_url(array('t', 'mode', '_f_', 'quickmod')) . '&amp;mode=unapproved_topics');
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index a4cd1dd5d1..b5b1dc0cf7 100755
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -377,7 +377,7 @@ function close_report($post_id_list, $mode, $action)
if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_report')))
{
- trigger_error('NOT_AUTHORIZED');
+ trigger_error('NOT_AUTHORISED');
}
if ($action == 'delete' && strpos($user->data['session_page'], 'mode=report_details') !== false)
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 1f7f0038d2..720d1f9467 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -75,7 +75,7 @@ class ucp_groups
if (!$auth->acl_get('u_chggrp'))
{
- trigger_error($user->lang['NOT_AUTHORIZED'] . $return_page);
+ trigger_error($user->lang['NOT_AUTHORISED'] . $return_page);
}
// User needs to be member of the group in order to make it default
@@ -326,7 +326,7 @@ class ucp_groups
// Hide hidden groups unless user is an admin with group privileges
$sql_and = ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? '<> ' . GROUP_SPECIAL : 'NOT IN (' . GROUP_SPECIAL . ', ' . GROUP_HIDDEN . ')';
- $sql = 'SELECT group_id, group_name, group_desc, group_desc_uid, group_desc_bitfield, group_desc_options, group_type, group_founder_manage
+ $sql = 'SELECT group_id, group_name, group_colour, group_desc, group_desc_uid, group_desc_bitfield, group_desc_options, group_type, group_founder_manage
FROM ' . GROUPS_TABLE . '
WHERE ' . ((sizeof($group_id_ary)) ? $db->sql_in_set('group_id', $group_id_ary, true) . ' AND ' : '') . "
group_type $sql_and
@@ -367,6 +367,7 @@ class ucp_groups
'GROUP_CLOSED' => ($row['group_type'] <> GROUP_CLOSED || $auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? false : true,
'GROUP_STATUS' => $user->lang['GROUP_IS_' . $group_status],
'S_CAN_JOIN' => ($row['group_type'] == GROUP_OPEN || $row['group_type'] == GROUP_FREE) ? true : false,
+ 'GROUP_COLOUR' => $row['group_colour'],
'U_VIEW_GROUP' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp;g=' . $row['group_id']),
@@ -1001,7 +1002,7 @@ class ucp_groups
default:
$user->add_lang('acp/common');
- $sql = 'SELECT g.group_id, g.group_name, g.group_desc, g.group_desc_uid, g.group_desc_bitfield, g.group_desc_options, g.group_type, ug.group_leader
+ $sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_desc, g.group_desc_uid, g.group_desc_bitfield, g.group_desc_options, g.group_type, ug.group_leader
FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
WHERE ug.user_id = ' . $user->data['user_id'] . '
AND g.group_id = ug.group_id
@@ -1016,6 +1017,7 @@ class ucp_groups
'GROUP_DESC' => generate_text_for_display($value['group_desc'], $value['group_desc_uid'], $value['group_desc_bitfield'], $value['group_desc_options']),
'GROUP_TYPE' => $value['group_type'],
'GROUP_ID' => $value['group_id'],
+ 'GROUP_COLOUR' => $value['group_colour'],
'U_LIST' => $this->u_action . "&amp;action=list&amp;g={$value['group_id']}",
'U_EDIT' => $this->u_action . "&amp;action=edit&amp;g={$value['group_id']}")
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index d48f11a71d..c6a1d20be7 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -207,7 +207,7 @@ function compose_pm($id, $mode, $action)
{
if (($post['forum_id'] && !$auth->acl_get('f_read', $post['forum_id'])) || (!$post['forum_id'] && !$auth->acl_getf_global('f_read')))
{
- trigger_error('NOT_AUTHORIZED');
+ trigger_error('NOT_AUTHORISED');
}
}
generated by cgit v1.2.1 (git 2.21.0) at 2025-05-21 14:47:36 +0000