Menu
▾
▴
[Phpbb-checkins] r9186 [3/3] - in /branches/acydburn/phpBB: ./ download/ includes/ includes/acm/ includes/acp/ includes/auth/ includes/classes/ includes/core/ includes/db/ includes/mcp/ install/ language/en/ plugins/ucp/
Modified: branches/acydburn/phpBB/includes/functions_posting.php
==============================================================================
*** branches/acydburn/phpBB/includes/functions_posting.php (original)
--- branches/acydburn/phpBB/includes/functions_posting.php Thu Dec 11 17:40:32 2008
***************
*** 248,254 ****
global $config, $template, $cache;
// Grab icons
! $icons = cache::obtain_icons();
if (!$icon_id)
{
--- 248,254 ----
global $config, $template, $cache;
// Grab icons
! $icons = phpbb_cache::obtain_icons();
if (!$icon_id)
{
***************
*** 376,382 ****
return $filedata;
}
! $extensions = cache::obtain_attach_extensions((($is_message) ? false : (int) $forum_id));
$upload->set_allowed_extensions(array_keys($extensions['_allowed_']));
$file = ($local) ? $upload->local_upload($local_storage, $local_filedata) : $upload->form_upload($form_name);
--- 376,382 ----
return $filedata;
}
! $extensions = phpbb_cache::obtain_attach_extensions((($is_message) ? false : (int) $forum_id));
$upload->set_allowed_extensions(array_keys($extensions['_allowed_']));
$file = ($local) ? $upload->local_upload($local_storage, $local_filedata) : $upload->form_upload($form_name);
***************
*** 998,1004 ****
$extensions = $attachments = array();
if ($has_attachments && $auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id))
{
! $extensions = cache::obtain_attach_extensions($forum_id);
// Get attachments...
$sql = 'SELECT *
--- 998,1004 ----
$extensions = $attachments = array();
if ($has_attachments && $auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id))
{
! $extensions = phpbb_cache::obtain_attach_extensions($forum_id);
// Get attachments...
$sql = 'SELECT *
Modified: branches/acydburn/phpBB/includes/functions_user.php
==============================================================================
*** branches/acydburn/phpBB/includes/functions_user.php (original)
--- branches/acydburn/phpBB/includes/functions_user.php Thu Dec 11 17:40:32 2008
***************
*** 1420,1426 ****
return 'USERNAME_TAKEN';
}
! $bad_usernames = cache::obtain_disallowed_usernames();
foreach ($bad_usernames as $bad_username)
{
--- 1420,1426 ----
return 'USERNAME_TAKEN';
}
! $bad_usernames = phpbb_cache::obtain_disallowed_usernames();
foreach ($bad_usernames as $bad_username)
{
Modified: branches/acydburn/phpBB/includes/mcp/mcp_forum.php
==============================================================================
*** branches/acydburn/phpBB/includes/mcp/mcp_forum.php (original)
--- branches/acydburn/phpBB/includes/mcp/mcp_forum.php Thu Dec 11 17:40:32 2008
***************
*** 134,140 ****
));
// Grab icons
! $icons = cache::obtain_icons();
$topic_rows = array();
--- 134,140 ----
));
// Grab icons
! $icons = phpbb_cache::obtain_icons();
$topic_rows = array();
Modified: branches/acydburn/phpBB/includes/mcp/mcp_post.php
==============================================================================
*** branches/acydburn/phpBB/includes/mcp/mcp_post.php (original)
--- branches/acydburn/phpBB/includes/mcp/mcp_post.php Thu Dec 11 17:40:32 2008
***************
*** 140,146 ****
if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
{
! $extensions = cache::obtain_attach_extensions($post_info['forum_id']);
$sql = 'SELECT *
FROM ' . ATTACHMENTS_TABLE . '
--- 140,146 ----
if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
{
! $extensions = phpbb_cache::obtain_attach_extensions($post_info['forum_id']);
$sql = 'SELECT *
FROM ' . ATTACHMENTS_TABLE . '
Modified: branches/acydburn/phpBB/includes/mcp/mcp_queue.php
==============================================================================
*** branches/acydburn/phpBB/includes/mcp/mcp_queue.php (original)
--- branches/acydburn/phpBB/includes/mcp/mcp_queue.php Thu Dec 11 17:40:32 2008
***************
*** 140,146 ****
if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
{
! $extensions = cache::obtain_attach_extensions($post_info['forum_id']);
$sql = 'SELECT *
FROM ' . ATTACHMENTS_TABLE . '
--- 140,146 ----
if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
{
! $extensions = phpbb_cache::obtain_attach_extensions($post_info['forum_id']);
$sql = 'SELECT *
FROM ' . ATTACHMENTS_TABLE . '
Modified: branches/acydburn/phpBB/includes/mcp/mcp_reports.php
==============================================================================
*** branches/acydburn/phpBB/includes/mcp/mcp_reports.php (original)
--- branches/acydburn/phpBB/includes/mcp/mcp_reports.php Thu Dec 11 17:40:32 2008
***************
*** 149,155 ****
if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
{
! $extensions = cache::obtain_attach_extensions($post_info['forum_id']);
$sql = 'SELECT *
FROM ' . ATTACHMENTS_TABLE . '
--- 149,155 ----
if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id']))
{
! $extensions = phpbb_cache::obtain_attach_extensions($post_info['forum_id']);
$sql = 'SELECT *
FROM ' . ATTACHMENTS_TABLE . '
***************
*** 425,431 ****
'PAGE_NUMBER' => on_page($total, $config['topics_per_page'], $start),
'TOPIC_ID' => $topic_id,
'TOTAL' => $total,
! 'TOTAL_REPORTS' => ($total == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $total),
)
);
--- 425,431 ----
'PAGE_NUMBER' => on_page($total, $config['topics_per_page'], $start),
'TOPIC_ID' => $topic_id,
'TOTAL' => $total,
! 'TOTAL_REPORTS' => ($total == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $total),
)
);
***************
*** 610,622 ****
$messenger->send($reporter['user_notify_type']);
}
}
!
foreach ($post_info as $post)
{
$forum_ids[$post['forum_id']] = $post['forum_id'];
$topic_ids[$post['topic_id']] = $post['topic_id'];
}
!
unset($notify_reporters, $post_info, $reports);
$messenger->save_queue();
--- 610,622 ----
$messenger->send($reporter['user_notify_type']);
}
}
!
foreach ($post_info as $post)
{
$forum_ids[$post['forum_id']] = $post['forum_id'];
$topic_ids[$post['topic_id']] = $post['topic_id'];
}
!
unset($notify_reporters, $post_info, $reports);
$messenger->save_queue();
***************
*** 648,654 ****
{
$return_topic = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid('viewtopic', 't=' . current($topic_ids) . '&f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
}
!
trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_forum . $return_topic . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>'));
}
}
--- 648,654 ----
{
$return_topic = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid('viewtopic', 't=' . current($topic_ids) . '&f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
}
!
trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_forum . $return_topic . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>'));
}
}
Modified: branches/acydburn/phpBB/includes/mcp/mcp_topic.php
==============================================================================
*** branches/acydburn/phpBB/includes/mcp/mcp_topic.php (original)
--- branches/acydburn/phpBB/includes/mcp/mcp_topic.php Thu Dec 11 17:40:32 2008
***************
*** 171,177 ****
$extensions = $attachments = array();
if ($topic_info['topic_attachment'] && sizeof($post_id_list))
{
! $extensions = cache::obtain_attach_extensions($topic_info['forum_id']);
// Get attachments...
if ($auth->acl_get('u_download') && $auth->acl_get('f_download', $topic_info['forum_id']))
--- 171,177 ----
$extensions = $attachments = array();
if ($topic_info['topic_attachment'] && sizeof($post_id_list))
{
! $extensions = phpbb_cache::obtain_attach_extensions($topic_info['forum_id']);
// Get attachments...
if ($auth->acl_get('u_download') && $auth->acl_get('f_download', $topic_info['forum_id']))
Modified: branches/acydburn/phpBB/index.php
==============================================================================
*** branches/acydburn/phpBB/index.php (original)
--- branches/acydburn/phpBB/index.php Thu Dec 11 17:40:32 2008
***************
*** 21,43 ****
include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
// Start session management
! $user->session_begin();
! $auth->acl($user->data);
! $user->setup('viewforum');
! display_forums('', $config['load_moderators']);
// Set some stats, get posts count from forums data if we... hum... retrieve all forums data
! $total_posts = $config['num_posts'];
! $total_topics = $config['num_topics'];
! $total_users = $config['num_users'];
!
! $l_total_user_s = ($total_users == 0) ? 'TOTAL_USERS_ZERO' : 'TOTAL_USERS_OTHER';
! $l_total_post_s = ($total_posts == 0) ? 'TOTAL_POSTS_ZERO' : 'TOTAL_POSTS_OTHER';
! $l_total_topic_s = ($total_topics == 0) ? 'TOTAL_TOPICS_ZERO' : 'TOTAL_TOPICS_OTHER';
// Grab group details for legend display
! if ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
{
$sql = 'SELECT group_id, group_name, group_colour, group_type
FROM ' . GROUPS_TABLE . '
--- 21,37 ----
include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
// Start session management
! phpbb::$user->setup('viewforum');
! display_forums('', phpbb::$config['load_moderators']);
// Set some stats, get posts count from forums data if we... hum... retrieve all forums data
! $total_posts = phpbb::$config['num_posts'];
! $total_topics = phpbb::$config['num_topics'];
! $total_users = phpbb::$config['num_users'];
// Grab group details for legend display
! if (phpbb::$acl->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
{
$sql = 'SELECT group_id, group_name, group_colour, group_type
FROM ' . GROUPS_TABLE . '
***************
*** 51,96 ****
LEFT JOIN ' . USER_GROUP_TABLE . ' ug
ON (
g.group_id = ug.group_id
! AND ug.user_id = ' . $user->data['user_id'] . '
AND ug.user_pending = 0
)
WHERE g.group_legend = 1
! AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $user->data['user_id'] . ')
ORDER BY g.group_name ASC';
}
! $result = $db->sql_query($sql);
$legend = array();
! while ($row = $db->sql_fetchrow($result))
{
$colour_text = ($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . '"' : '';
! $group_name = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'];
! if ($row['group_name'] == 'BOTS' || ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')))
{
$legend[] = '<span' . $colour_text . '>' . $group_name . '</span>';
}
else
{
! $legend[] = '<a' . $colour_text . ' href="' . append_sid('memberlist', 'mode=group&g=' . $row['group_id']) . '">' . $group_name . '</a>';
}
}
! $db->sql_freeresult($result);
$legend = implode(', ', $legend);
// Generate birthday list if required ...
$birthday_list = '';
! if ($config['load_birthdays'] && $config['allow_birthdays'])
{
! $now = getdate(time() + $user->timezone + $user->dst - date('Z'));
$sql = 'SELECT user_id, username, user_colour, user_birthday
FROM ' . USERS_TABLE . "
! WHERE user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%'
AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')';
! $result = $db->sql_query($sql);
! while ($row = $db->sql_fetchrow($result))
{
$birthday_list .= (($birthday_list != '') ? ', ' : '') . get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
--- 45,90 ----
LEFT JOIN ' . USER_GROUP_TABLE . ' ug
ON (
g.group_id = ug.group_id
! AND ug.user_id = ' . phpbb::$user->data['user_id'] . '
AND ug.user_pending = 0
)
WHERE g.group_legend = 1
! AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . phpbb::$user->data['user_id'] . ')
ORDER BY g.group_name ASC';
}
! $result = phpbb::$db->sql_query($sql);
$legend = array();
! while ($row = phpbb::$db->sql_fetchrow($result))
{
$colour_text = ($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . '"' : '';
! $group_name = ($row['group_type'] == GROUP_SPECIAL) ? phpbb::$user->lang['G_' . $row['group_name']] : $row['group_name'];
! if ($row['group_name'] == 'BOTS' || (phpbb::$user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')))
{
$legend[] = '<span' . $colour_text . '>' . $group_name . '</span>';
}
else
{
! $legend[] = '<a' . $colour_text . ' href="' . phpbb::$url->append_sid('memberlist', 'mode=group&g=' . $row['group_id']) . '">' . $group_name . '</a>';
}
}
! phpbb::$db->sql_freeresult($result);
$legend = implode(', ', $legend);
// Generate birthday list if required ...
$birthday_list = '';
! if (phpbb::$config['load_birthdays'] && phpbb::$config['allow_birthdays'])
{
! $now = getdate(time() + phpbb::$user->timezone + phpbb::$user->dst - date('Z'));
$sql = 'SELECT user_id, username, user_colour, user_birthday
FROM ' . USERS_TABLE . "
! WHERE user_birthday LIKE '" . phpbb::$db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%'
AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')';
! $result = phpbb::$db->sql_query($sql);
! while ($row = phpbb::$db->sql_fetchrow($result))
{
$birthday_list .= (($birthday_list != '') ? ', ' : '') . get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
***************
*** 99,133 ****
$birthday_list .= ' (' . ($now['year'] - $age) . ')';
}
}
! $db->sql_freeresult($result);
}
// Assign index specific vars
! $template->assign_vars(array(
! 'TOTAL_POSTS' => sprintf($user->lang[$l_total_post_s], $total_posts),
! 'TOTAL_TOPICS' => sprintf($user->lang[$l_total_topic_s], $total_topics),
! 'TOTAL_USERS' => sprintf($user->lang[$l_total_user_s], $total_users),
! 'NEWEST_USER' => sprintf($user->lang['NEWEST_USER'], get_username_string('full', $config['newest_user_id'], $config['newest_username'], $config['newest_user_colour'])),
'LEGEND' => $legend,
'BIRTHDAY_LIST' => $birthday_list,
! 'FORUM_IMG' => $user->img('forum_read', 'NO_NEW_POSTS'),
! 'FORUM_NEW_IMG' => $user->img('forum_unread', 'NEW_POSTS'),
! 'FORUM_LOCKED_IMG' => $user->img('forum_read_locked', 'NO_NEW_POSTS_LOCKED'),
! 'FORUM_NEW_LOCKED_IMG' => $user->img('forum_unread_locked', 'NO_NEW_POSTS_LOCKED'),
! 'S_LOGIN_ACTION' => append_sid('ucp', 'mode=login'),
! 'S_DISPLAY_BIRTHDAY_LIST' => ($config['load_birthdays']) ? true : false,
! 'U_MARK_FORUMS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid('index', 'hash=' . generate_link_hash('global') . '&mark=forums') : '',
! 'U_MCP' => ($auth->acl_get('m_') || $auth->acl_getf_global('m_')) ? append_sid('mcp', 'i=main&mode=front', true, $user->session_id) : '')
);
// Output page
! page_header($user->lang['INDEX']);
! $template->set_filenames(array(
'body' => 'index_body.html')
);
--- 93,127 ----
$birthday_list .= ' (' . ($now['year'] - $age) . ')';
}
}
! phpbb::$db->sql_freeresult($result);
}
// Assign index specific vars
! phpbb::$template->assign_vars(array(
! 'TOTAL_POSTS' => phpbb::$user->lang('TOTAL_POSTS_COUNT', $total_posts),
! 'TOTAL_TOPICS' => phpbb::$user->lang('TOTAL_TOPICS_COUNT', $total_topics),
! 'TOTAL_USERS' => phpbb::$user->lang('TOTAL_USERS_COUNT', $total_users),
! 'NEWEST_USER' => phpbb::$user->lang('NEWEST_USER', get_username_string('full', phpbb::$config['newest_user_id'], phpbb::$config['newest_username'], phpbb::$config['newest_user_colour'])),
'LEGEND' => $legend,
'BIRTHDAY_LIST' => $birthday_list,
! 'FORUM_IMG' => phpbb::$user->img('forum_read', 'NO_NEW_POSTS'),
! 'FORUM_NEW_IMG' => phpbb::$user->img('forum_unread', 'NEW_POSTS'),
! 'FORUM_LOCKED_IMG' => phpbb::$user->img('forum_read_locked', 'NO_NEW_POSTS_LOCKED'),
! 'FORUM_NEW_LOCKED_IMG' => phpbb::$user->img('forum_unread_locked', 'NO_NEW_POSTS_LOCKED'),
! 'S_LOGIN_ACTION' => phpbb::$url->append_sid('ucp', 'mode=login'),
! 'S_DISPLAY_BIRTHDAY_LIST' => (phpbb::$config['load_birthdays']) ? true : false,
! 'U_MARK_FORUMS' => (phpbb::$user->is_registered || phpbb::$config['load_anon_lastread']) ? append_sid('index', 'hash=' . generate_link_hash('global') . '&mark=forums') : '',
! 'U_MCP' => (phpbb::$acl->acl_get('m_') || phpbb::$acl->acl_getf_global('m_')) ? phpbb::$url->append_sid('mcp', 'i=main&mode=front', true, phpbb::$user->session_id) : '')
);
// Output page
! page_header(phpbb::$user->lang['INDEX']);
! phpbb::$template->set_filenames(array(
'body' => 'index_body.html')
);
Modified: branches/acydburn/phpBB/install/install_update.php
==============================================================================
*** branches/acydburn/phpBB/install/install_update.php (original)
--- branches/acydburn/phpBB/install/install_update.php Thu Dec 11 17:40:32 2008
***************
*** 905,911 ****
// Now update the installation or download the archive...
$download_filename = 'update_' . $this->update_info['version']['from'] . '_to_' . $this->update_info['version']['to'];
! $archive_filename = $download_filename . '_' . time() . '_' . unique_id();
// Now init the connection
if ($update_mode == 'download')
--- 905,911 ----
// Now update the installation or download the archive...
$download_filename = 'update_' . $this->update_info['version']['from'] . '_to_' . $this->update_info['version']['to'];
! $archive_filename = $download_filename . '_' . time() . '_' . phpbb::$security->unique_id();
// Now init the connection
if ($update_mode == 'download')
Modified: branches/acydburn/phpBB/language/en/common.php
==============================================================================
*** branches/acydburn/phpBB/language/en/common.php (original)
--- branches/acydburn/phpBB/language/en/common.php Thu Dec 11 17:40:32 2008
***************
*** 107,114 ****
'BOARD_DISABLE' => 'Sorry but this board is currently unavailable.',
'BOARD_DISABLED' => 'This board is currently disabled.',
'BOARD_UNAVAILABLE' => 'Sorry but the board is temporarily unavailable, please try again in a few minutes.',
! 'BROWSING_FORUM_GUEST' => 'Users browsing this forum: %1$s and %2$d guest',
! 'BROWSING_FORUM_GUESTS' => 'Users browsing this forum: %1$s and %2$d guests',
'BYTES' => 'Bytes',
'CANCEL' => 'Cancel',
--- 107,116 ----
'BOARD_DISABLE' => 'Sorry but this board is currently unavailable.',
'BOARD_DISABLED' => 'This board is currently disabled.',
'BOARD_UNAVAILABLE' => 'Sorry but the board is temporarily unavailable, please try again in a few minutes.',
! 'BROWSING_FORUM_GUESTS' => array(
! 0 => 'Users browsing this forum: %1$s and %2$d guest',
! 2 => 'Users browsing this forum: %1$s and %2$d guests',
! ),
'BYTES' => 'Bytes',
'CANCEL' => 'Cancel',
***************
*** 236,246 ****
'GROUP_ERR_USER_LONG' => 'Group names cannot exceed 60 characters. The specified group name is too long.',
'GUEST' => 'Guest',
'GUEST_USERS_ONLINE' => 'There are %d guest users online',
- 'GUEST_USERS_TOTAL' => '%d guests',
'GUEST_USERS_ZERO_ONLINE' => 'There are 0 guest users online',
- 'GUEST_USERS_ZERO_TOTAL' => '0 guests',
'GUEST_USER_ONLINE' => 'There is %d guest user online',
! 'GUEST_USER_TOTAL' => '%d guest',
'G_ADMINISTRATORS' => 'Administrators',
'G_BOTS' => 'Bots',
'G_GUESTS' => 'Guests',
--- 238,252 ----
'GROUP_ERR_USER_LONG' => 'Group names cannot exceed 60 characters. The specified group name is too long.',
'GUEST' => 'Guest',
'GUEST_USERS_ONLINE' => 'There are %d guest users online',
'GUEST_USERS_ZERO_ONLINE' => 'There are 0 guest users online',
'GUEST_USER_ONLINE' => 'There is %d guest user online',
!
! 'GUEST_USER_COUNT' => array(
! 0 => '%d guests',
! 1 => '%d guest',
! 2 => '%d guests',
! ),
!
'G_ADMINISTRATORS' => 'Administrators',
'G_BOTS' => 'Bots',
'G_GUESTS' => 'Guests',
***************
*** 249,259 ****
'G_GLOBAL_MODERATORS' => 'Global moderators',
'HIDDEN_USERS_ONLINE' => '%d hidden users online',
- 'HIDDEN_USERS_TOTAL' => '%d hidden and ',
'HIDDEN_USERS_ZERO_ONLINE' => '0 hidden users online',
- 'HIDDEN_USERS_ZERO_TOTAL' => '0 hidden and ',
'HIDDEN_USER_ONLINE' => '%d hidden user online',
! 'HIDDEN_USER_TOTAL' => '%d hidden and ',
'HIDE_GUESTS' => 'Hide guests',
'HIDE_ME' => 'Hide my online status this session',
'HOURS' => 'Hours',
--- 255,267 ----
'G_GLOBAL_MODERATORS' => 'Global moderators',
'HIDDEN_USERS_ONLINE' => '%d hidden users online',
'HIDDEN_USERS_ZERO_ONLINE' => '0 hidden users online',
'HIDDEN_USER_ONLINE' => '%d hidden user online',
!
! 'HIDDEN_USER_COUNT' => array(
! 0 => '%d hidden and ',
! ),
!
'HIDE_GUESTS' => 'Hide guests',
'HIDE_ME' => 'Hide my online status this session',
'HOURS' => 'Hours',
***************
*** 327,334 ****
'MESSAGE_BODY' => 'Message body',
'MINUTES' => 'Minutes',
'MODERATE' => 'Moderate',
! 'MODERATOR' => 'Moderator',
! 'MODERATORS' => 'Moderators',
'MONTH' => 'Month',
'MOVE' => 'Move',
'MSNM' => 'MSNM/WLM',
--- 335,344 ----
'MESSAGE_BODY' => 'Message body',
'MINUTES' => 'Minutes',
'MODERATE' => 'Moderate',
! 'MODERATORS' => array(
! 0 => 'Moderator',
! 2 => 'Moderators',
! ),
'MONTH' => 'Month',
'MOVE' => 'Move',
'MSNM' => 'MSNM/WLM',
***************
*** 337,344 ****
'NEWEST_USER' => 'Our newest member <strong>%s</strong>',
'NEW_MESSAGE' => 'New message',
'NEW_MESSAGES' => 'New messages',
! 'NEW_PM' => '<strong>%d</strong> new message',
! 'NEW_PMS' => '<strong>%d</strong> new messages',
'NEW_POST' => 'New post',
'NEW_POSTS' => 'New posts',
'NEXT' => 'Next', // Used in pagination
--- 347,357 ----
'NEWEST_USER' => 'Our newest member <strong>%s</strong>',
'NEW_MESSAGE' => 'New message',
'NEW_MESSAGES' => 'New messages',
! 'NEW_PM' => array(
! 0 => '<strong>%d</strong> new messages',
! 1 => '<strong>%d</strong> new message',
! 2 => '<strong>%d</strong> new messages',
! ),
'NEW_POST' => 'New post',
'NEW_POSTS' => 'New posts',
'NEXT' => 'Next', // Used in pagination
***************
*** 401,409 ****
'OFFLINE' => 'Offline',
'ONLINE' => 'Online',
'ONLINE_BUDDIES' => 'Online friends',
! 'ONLINE_USERS_TOTAL' => 'In total there are <strong>%d</strong> users online :: ',
! 'ONLINE_USERS_ZERO_TOTAL' => 'In total there are <strong>0</strong> users online :: ',
! 'ONLINE_USER_TOTAL' => 'In total there is <strong>%d</strong> user online :: ',
'OPTIONS' => 'Options',
'PAGE_OF' => 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
--- 414,425 ----
'OFFLINE' => 'Offline',
'ONLINE' => 'Online',
'ONLINE_BUDDIES' => 'Online friends',
!
! 'ONLINE_USER_COUNT' => array(
! 0 => 'In total there are <strong>0</strong> users online :: ',
! 1 => 'In total there is <strong>%d</strong> user online :: ',
! 2 => 'In total there are <strong>%d</strong> users online :: ',
! ),
'OPTIONS' => 'Options',
'PAGE_OF' => 'Page <strong>%1$d</strong> of <strong>%2$d</strong>',
***************
*** 455,465 ****
'REGISTER' => 'Register',
'REGISTERED_USERS' => 'Registered users:',
'REG_USERS_ONLINE' => 'There are %d registered users and ',
- 'REG_USERS_TOTAL' => '%d registered, ',
'REG_USERS_ZERO_ONLINE' => 'There are 0 registered users and ',
! 'REG_USERS_ZERO_TOTAL' => '0 registered, ',
'REG_USER_ONLINE' => 'There is %d registered user and ',
- 'REG_USER_TOTAL' => '%d registered, ',
'REMOVE' => 'Remove',
'REMOVE_INSTALL' => 'Please delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.',
'REPLIES' => 'Replies',
--- 471,483 ----
'REGISTER' => 'Register',
'REGISTERED_USERS' => 'Registered users:',
'REG_USERS_ONLINE' => 'There are %d registered users and ',
'REG_USERS_ZERO_ONLINE' => 'There are 0 registered users and ',
!
! 'REG_USER_COUNT' => array(
! 0 => '%d registered, ',
! ),
!
'REG_USER_ONLINE' => 'There is %d registered user and ',
'REMOVE' => 'Remove',
'REMOVE_INSTALL' => 'Please delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.',
'REPLIES' => 'Replies',
***************
*** 535,542 ****
'START_WATCHING_TOPIC' => 'Subscribe topic',
'STOP_WATCHING_FORUM' => 'Unsubscribe forum',
'STOP_WATCHING_TOPIC' => 'Unsubscribe topic',
! 'SUBFORUM' => 'Subforum',
! 'SUBFORUMS' => 'Subforums',
'SUBJECT' => 'Subject',
'SUBMIT' => 'Submit',
--- 553,562 ----
'START_WATCHING_TOPIC' => 'Subscribe topic',
'STOP_WATCHING_FORUM' => 'Unsubscribe forum',
'STOP_WATCHING_TOPIC' => 'Unsubscribe topic',
! 'SUBFORUMS' => array(
! 0 => 'Subforum',
! 2 => 'Subforums',
! ),
'SUBJECT' => 'Subject',
'SUBMIT' => 'Submit',
***************
*** 602,615 ****
'TOTAL_NO_PM' => '0 private messages in total',
'TOTAL_PM' => '1 private message in total',
'TOTAL_PMS' => '%d private messages in total',
- 'TOTAL_POSTS' => 'Total posts',
- 'TOTAL_POSTS_OTHER' => 'Total posts <strong>%d</strong>',
- 'TOTAL_POSTS_ZERO' => 'Total posts <strong>0</strong>',
'TOPIC_REPORTED' => 'This topic has been reported',
! 'TOTAL_TOPICS_OTHER'=> 'Total topics <strong>%d</strong>',
! 'TOTAL_TOPICS_ZERO' => 'Total topics <strong>0</strong>',
! 'TOTAL_USERS_OTHER' => 'Total members <strong>%d</strong>',
! 'TOTAL_USERS_ZERO' => 'Total members <strong>0</strong>',
'TRACKED_PHP_ERROR' => 'Tracked PHP errors: %s',
'UNABLE_GET_IMAGE_SIZE' => 'It was not possible to determine the dimensions of the image.',
--- 622,639 ----
'TOTAL_NO_PM' => '0 private messages in total',
'TOTAL_PM' => '1 private message in total',
'TOTAL_PMS' => '%d private messages in total',
'TOPIC_REPORTED' => 'This topic has been reported',
! 'TOTAL_POSTS' => 'Total posts',
!
! 'TOTAL_POSTS_COUNT' => array(
! 0 => 'Total posts <strong>%d</strong>',
! ),
! 'TOTAL_TOPICS_COUNT'=> array(
! 0 => 'Total topics <strong>%d</strong>',
! ),
! 'TOTAL_USERS_COUNT' => array(
! 0 => 'Total members <strong>%d</strong>',
! ),
'TRACKED_PHP_ERROR' => 'Tracked PHP errors: %s',
'UNABLE_GET_IMAGE_SIZE' => 'It was not possible to determine the dimensions of the image.',
***************
*** 617,624 ****
'UNKNOWN_BROWSER' => 'Unknown browser',
'UNMARK_ALL' => 'Unmark all',
'UNREAD_MESSAGES' => 'Unread messages',
! 'UNREAD_PM' => '<strong>%d</strong> unread message',
! 'UNREAD_PMS' => '<strong>%d</strong> unread messages',
'UNWATCHED_FORUMS' => 'You are no longer subscribed to the selected forums.',
'UNWATCHED_TOPICS' => 'You are no longer subscribed to the selected topics.',
'UNWATCHED_FORUMS_TOPICS' => 'You are no longer subscribed to the selected entries.',
--- 641,651 ----
'UNKNOWN_BROWSER' => 'Unknown browser',
'UNMARK_ALL' => 'Unmark all',
'UNREAD_MESSAGES' => 'Unread messages',
! 'UNREAD_PM' => array(
! 0 => '<strong>%d</strong> unread messages',
! 1 => '<strong>%d</strong> unread message',
! 2 => '<strong>%d</strong> unread messages',
! ),
'UNWATCHED_FORUMS' => 'You are no longer subscribed to the selected forums.',
'UNWATCHED_TOPICS' => 'You are no longer subscribed to the selected topics.',
'UNWATCHED_FORUMS_TOPICS' => 'You are no longer subscribed to the selected entries.',
***************
*** 651,658 ****
'VIEW_LATEST_POST' => 'View the latest post',
'VIEW_NEWEST_POST' => 'View first unread post',
'VIEW_NOTES' => 'View user notes',
! 'VIEW_ONLINE_TIME' => 'based on users active over the past %d minute',
! 'VIEW_ONLINE_TIMES' => 'based on users active over the past %d minutes',
'VIEW_TOPIC' => 'View topic',
'VIEW_TOPIC_ANNOUNCEMENT' => 'Announcement: ',
'VIEW_TOPIC_GLOBAL' => 'Global Announcement: ',
--- 678,687 ----
'VIEW_LATEST_POST' => 'View the latest post',
'VIEW_NEWEST_POST' => 'View first unread post',
'VIEW_NOTES' => 'View user notes',
! 'VIEW_ONLINE_TIME' => array(
! 0 => 'based on users active over the past %d minute',
! 2 => 'based on users active over the past %d minutes',
! ),
'VIEW_TOPIC' => 'View topic',
'VIEW_TOPIC_ANNOUNCEMENT' => 'Announcement: ',
'VIEW_TOPIC_GLOBAL' => 'Global Announcement: ',
Modified: branches/acydburn/phpBB/memberlist.php
==============================================================================
*** branches/acydburn/phpBB/memberlist.php (original)
--- branches/acydburn/phpBB/memberlist.php Thu Dec 11 17:40:32 2008
***************
*** 64,70 ****
// Grab rank information for later
! $ranks = cache::obtain_ranks();
// What do you want to do today? ... oops, I think that line is taken ...
--- 64,70 ----
// Grab rank information for later
! $ranks = phpbb_cache::obtain_ranks();
// What do you want to do today? ... oops, I think that line is taken ...
Modified: branches/acydburn/phpBB/plugins/ucp/ucp_pm_viewfolder.php
==============================================================================
*** branches/acydburn/phpBB/plugins/ucp/ucp_pm_viewfolder.php (original)
--- branches/acydburn/phpBB/plugins/ucp/ucp_pm_viewfolder.php Thu Dec 11 17:40:32 2008
***************
*** 33,39 ****
$user->add_lang('viewforum');
// Grab icons
! $icons = cache::obtain_icons();
$color_rows = array('marked', 'replied');
--- 33,39 ----
$user->add_lang('viewforum');
// Grab icons
! $icons = phpbb_cache::obtain_icons();
$color_rows = array('marked', 'replied');
Modified: branches/acydburn/phpBB/plugins/ucp/ucp_pm_viewmessage.php
==============================================================================
*** branches/acydburn/phpBB/plugins/ucp/ucp_pm_viewmessage.php (original)
--- branches/acydburn/phpBB/plugins/ucp/ucp_pm_viewmessage.php Thu Dec 11 17:40:32 2008
***************
*** 46,52 ****
}
// Grab icons
! $icons = cache::obtain_icons();
$bbcode = false;
--- 46,52 ----
}
// Grab icons
! $icons = phpbb_cache::obtain_icons();
$bbcode = false;
Modified: branches/acydburn/phpBB/search.php
==============================================================================
*** branches/acydburn/phpBB/search.php (original)
--- branches/acydburn/phpBB/search.php Thu Dec 11 17:40:32 2008
***************
*** 450,456 ****
$user->add_lang('viewtopic');
// Grab icons
! $icons = cache::obtain_icons();
// Output header
if ($search_id && ($total_match_count > 1000))
--- 450,456 ----
$user->add_lang('viewtopic');
// Grab icons
! $icons = phpbb_cache::obtain_icons();
// Output header
if ($search_id && ($total_match_count > 1000))
Modified: branches/acydburn/phpBB/style.php
==============================================================================
*** branches/acydburn/phpBB/style.php (original)
--- branches/acydburn/phpBB/style.php Thu Dec 11 17:40:32 2008
***************
*** 33,38 ****
--- 33,39 ----
exit;
}
+ define('PHPBB_FRAMEWORK_SAFE', true);
include(PHPBB_ROOT_PATH . 'common.' . PHP_EXT);
$user = false;
***************
*** 41,57 ****
{
$sql = 'SELECT u.user_id, u.user_lang
FROM ' . SESSIONS_TABLE . ' s, ' . USERS_TABLE . " u
! WHERE s.session_id = '" . $db->sql_escape($sid) . "'
AND s.session_user_id = u.user_id";
! $result = $db->sql_query($sql);
! $user = $db->sql_fetchrow($result);
! $db->sql_freeresult($result);
}
! $recompile = $config['load_tplcompile'];
if (!$user)
{
! $id = $config['default_style'];
$recompile = false;
$user = array('user_id' => ANONYMOUS);
}
--- 42,58 ----
{
$sql = 'SELECT u.user_id, u.user_lang
FROM ' . SESSIONS_TABLE . ' s, ' . USERS_TABLE . " u
! WHERE s.session_id = '" . phpbb::$db->sql_escape($sid) . "'
AND s.session_user_id = u.user_id";
! $result = phpbb::$db->sql_query($sql);
! $user = phpbb::$db->sql_fetchrow($result);
! phpbb::$db->sql_freeresult($result);
}
! $recompile = phpbb::$config['load_tplcompile'];
if (!$user)
{
! $id = phpbb::$config['default_style'];
$recompile = false;
$user = array('user_id' => ANONYMOUS);
}
***************
*** 62,70 ****
AND t.template_id = s.template_id
AND c.theme_id = s.theme_id
AND i.imageset_id = s.imageset_id';
! $result = $db->sql_query($sql, 300);
! $theme = $db->sql_fetchrow($result);
! $db->sql_freeresult($result);
if (!$theme)
{
--- 63,71 ----
AND t.template_id = s.template_id
AND c.theme_id = s.theme_id
AND i.imageset_id = s.imageset_id';
! $result = phpbb::$db->sql_query($sql, 300);
! $theme = phpbb::$db->sql_fetchrow($result);
! phpbb::$db->sql_freeresult($result);
if (!$theme)
{
***************
*** 74,100 ****
if ($user['user_id'] == ANONYMOUS)
{
! $user['user_lang'] = $config['default_lang'];
}
! $user_image_lang = (file_exists(PHPBB_ROOT_PATH . 'styles/' . $theme['imageset_path'] . '/imageset/' . $user['user_lang'])) ? $user['user_lang'] : $config['default_lang'];
$sql = 'SELECT *
FROM ' . STYLES_IMAGESET_DATA_TABLE . '
WHERE imageset_id = ' . $theme['imageset_id'] . "
AND image_filename <> ''
! AND image_lang IN ('" . $db->sql_escape($user_image_lang) . "', '')";
! $result = $db->sql_query($sql, 3600);
$img_array = array();
! while ($row = $db->sql_fetchrow($result))
{
$img_array[$row['image_name']] = $row;
}
! $db->sql_freeresult($result);
// gzip_compression
! if ($config['gzip_compress'])
{
// IE6 is not able to compress the style (do not ask us why!)
$browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? strtolower(htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT'])) : '';
--- 75,101 ----
if ($user['user_id'] == ANONYMOUS)
{
! $user['user_lang'] = phpbb::$config['default_lang'];
}
! $user_image_lang = (file_exists(PHPBB_ROOT_PATH . 'styles/' . $theme['imageset_path'] . '/imageset/' . $user['user_lang'])) ? $user['user_lang'] : phpbb::$config['default_lang'];
$sql = 'SELECT *
FROM ' . STYLES_IMAGESET_DATA_TABLE . '
WHERE imageset_id = ' . $theme['imageset_id'] . "
AND image_filename <> ''
! AND image_lang IN ('" . phpbb::$db->sql_escape($user_image_lang) . "', '')";
! $result = phpbb::$db->sql_query($sql, 3600);
$img_array = array();
! while ($row = phpbb::$db->sql_fetchrow($result))
{
$img_array[$row['image_name']] = $row;
}
! phpbb::$db->sql_freeresult($result);
// gzip_compression
! if (phpbb::$config['gzip_compress'])
{
// IE6 is not able to compress the style (do not ask us why!)
$browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? strtolower(htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT'])) : '';
Modified: branches/acydburn/phpBB/viewforum.php
==============================================================================
*** branches/acydburn/phpBB/viewforum.php (original)
--- branches/acydburn/phpBB/viewforum.php Thu Dec 11 17:40:32 2008
***************
*** 306,312 ****
'S_SINGLE_MODERATOR' => (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true,
'S_IS_LOCKED' => ($forum_data['forum_status'] == ITEM_LOCKED) ? true : false,
'S_VIEWFORUM' => true,
!
'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid('mcp', "f=$forum_id&i=main&mode=forum_view", true, $user->session_id) : '',
'U_POST_NEW_TOPIC' => ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid('posting', 'mode=post&f=' . $forum_id) : '',
'U_VIEW_FORUM' => append_sid('viewforum', "f=$forum_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . "&start=$start"),
--- 306,312 ----
'S_SINGLE_MODERATOR' => (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true,
'S_IS_LOCKED' => ($forum_data['forum_status'] == ITEM_LOCKED) ? true : false,
'S_VIEWFORUM' => true,
!
'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid('mcp', "f=$forum_id&i=main&mode=forum_view", true, $user->session_id) : '',
'U_POST_NEW_TOPIC' => ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid('posting', 'mode=post&f=' . $forum_id) : '',
'U_VIEW_FORUM' => append_sid('viewforum', "f=$forum_id" . ((strlen($u_sort_param)) ? "&$u_sort_param" : '') . "&start=$start"),
***************
*** 314,320 ****
));
// Grab icons
! $icons = cache::obtain_icons();
// Grab all topic data
$rowset = $announcement_list = $topic_list = $global_announce_list = array();
--- 314,320 ----
));
// Grab icons
! $icons = phpbb_cache::obtain_icons();
// Grab all topic data
$rowset = $announcement_list = $topic_list = $global_announce_list = array();
Modified: branches/acydburn/phpBB/viewtopic.php
==============================================================================
*** branches/acydburn/phpBB/viewtopic.php (original)
--- branches/acydburn/phpBB/viewtopic.php Thu Dec 11 17:40:32 2008
***************
*** 505,520 ****
}
// Grab ranks
! $ranks = cache::obtain_ranks();
// Grab icons
! $icons = cache::obtain_icons();
// Grab extensions
$extensions = array();
if ($topic_data['topic_attachment'])
{
! $extensions = cache::obtain_attach_extensions($forum_id);
}
// Forum rules listing
--- 505,520 ----
}
// Grab ranks
! $ranks = phpbb_cache::obtain_ranks();
// Grab icons
! $icons = phpbb_cache::obtain_icons();
// Grab extensions
$extensions = array();
if ($topic_data['topic_attachment'])
{
! $extensions = phpbb_cache::obtain_attach_extensions($forum_id);
}
// Forum rules listing
|
