makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- some ucp changes (added the module info too)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5302 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2005-11-17 17:32:25 +00:00
parent 3676222231
commit e21245f2ee
20 changed files with 533 additions and 293 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions.php
View file

@ -1745,7 +1745,7 @@ function page_header($page_title = '')
$s_privmsg_new = false; $s_privmsg_new = false;
// Obtain number of new private messages if user is logged in // Obtain number of new private messages if user is logged in
if ($user->data['is_registered']) if (isset($user->data['is_registered']) && $user->data['is_registered'])
{ {
if ($user->data['user_new_privmsg']) if ($user->data['user_new_privmsg'])
{ {

78
phpBB/includes/functions_admin.php
View file

@ -2359,6 +2359,84 @@ function update_post_information($type, $ids)
} }
} }
/**
* Get database size
* Currently only mysql and mssql are supported
*/
function get_database_size()
{
global $db, $user, $table_prefix;
// This code is heavily influenced by a similar routine
// in phpMyAdmin 2.2.0
if (preg_match('#^mysql#', SQL_LAYER))
{
$result = $db->sql_query('SELECT VERSION() AS mysql_version');
if ($row = $db->sql_fetchrow($result))
{
$version = $row['mysql_version'];
if (preg_match('#^(3\.23|4\.|5\.)#', $version))
{
$db_name = (preg_match('#^(3\.23\.[6-9])|(3\.23\.[1-9][1-9])|(4\.)|(5\.)#', $version)) ? "`{$db->dbname}`" : $db->dbname;
$sql = "SHOW TABLE STATUS
FROM " . $db_name;
$result = $db->sql_query($sql);
$dbsize = 0;
while ($row = $db->sql_fetchrow($result))
{
if ((isset($row['Type']) && $row['Type'] != 'MRG_MyISAM') || (isset($row['Engine']) && $row['Engine'] == 'MyISAM'))
{
if ($table_prefix != '')
{
if (strstr($row['Name'], $table_prefix))
{
$dbsize += $row['Data_length'] + $row['Index_length'];
}
}
else
{
$dbsize += $row['Data_length'] + $row['Index_length'];
}
}
}
$db->sql_freeresult($result);
}
else
{
$dbsize = $user->lang['NOT_AVAILABLE'];
}
}
else
{
$dbsize = $user->lang['NOT_AVAILABLE'];
}
}
else if (preg_match('#^mssql#', SQL_LAYER))
{
$sql = 'SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize
FROM sysfiles';
$result = $db->sql_query($sql);
$dbsize = ($row = $db->sql_fetchrow($result)) ? intval($row['dbsize']) : $user->lang['NOT_AVAILABLE'];
$db->sql_freeresult($result);
}
else
{
$dbsize = $user->lang['NOT_AVAILABLE'];
}
if (is_int($dbsize))
{
$dbsize = ($dbsize >= 1048576) ? sprintf('%.2f ' . $user->lang['MB'], ($dbsize / 1048576)) : (($dbsize >= 1024) ? sprintf('%.2f ' . $user->lang['KB'], ($dbsize / 1024)) : sprintf('%.2f ' . $user->lang['BYTES'], $dbsize));
}
return $dbsize;
}
/** /**
* Tidy database * Tidy database
* Removes all tracking rows older than 6 months, including mark_posted informations * Removes all tracking rows older than 6 months, including mark_posted informations

3
phpBB/includes/functions_module.php
View file

@ -310,7 +310,8 @@ class p_master
} }
} }
$u_title = $module_url . '&i=' . (($itep_ary['cat']) ? $itep_ary['id'] : $itep_ary['name'] . '&mode=' . $itep_ary['mode'] . $itep_ary['url_extra']); $u_title = $module_url . '&i=' . (($itep_ary['cat']) ? $itep_ary['id'] : $itep_ary['name'] . '&mode=' . $itep_ary['mode']);
$u_title .= (!$itep_ary['cat'] && isset($itep_ary['url_extra'])) ? $itep_ary['url_extra'] : '';
// Only output a categories items if it's currently selected // Only output a categories items if it's currently selected
if (!$depth || ($depth && (in_array($itep_ary['parent'], array_values($this->module_cache['parents'])) || $itep_ary['parent'] == $this->p_parent))) if (!$depth || ($depth && (in_array($itep_ary['parent'], array_values($this->module_cache['parents'])) || $itep_ary['parent'] == $this->p_parent)))

26
phpBB/includes/ucp/ucp_attachments.php
View file

@ -159,4 +159,30 @@ class ucp_attachments
} }
} }
/**
* @package module_install
*/
class ucp_attachments_info
{
function module()
{
return array(
'filename' => 'ucp_attachments',
'title' => 'UCP_ATTACHMENTS',
'version' => '1.0.0',
'modes' => array(
'attachments' => array('title' => 'UCP_ATTACHMENTS', 'auth' => 'acl_u_attach'),
),
);
}
function install()
{
}
function uninstall()
{
}
}
?> ?>

27
phpBB/includes/ucp/ucp_groups.php
View file

@ -371,4 +371,31 @@ class ucp_groups
} }
} }
/**
* @package module_install
*/
class ucp_groups_info
{
function module()
{
return array(
'filename' => 'ucp_groups',
'title' => 'UCP_USERGROUPS',
'version' => '1.0.0',
'modes' => array(
'membership' => array('title' => 'UCP_USERGROUPS_MEMBER', 'auth' => ''),
'manage' => array('title' => 'UCP_USERGROUPS_MANAGE', 'auth' => ''),
),
);
}
function install()
{
}
function uninstall()
{
}
}
?> ?>

136
phpBB/includes/ucp/ucp_main.php
View file

@ -32,51 +32,6 @@ class ucp_main
$user->add_lang('memberlist'); $user->add_lang('memberlist');
/*
if ($config['load_db_lastread'] || $config['load_db_track'])
{
if ($config['load_db_lastread'])
{
$sql = 'SELECT mark_time
FROM ' . FORUMS_TRACK_TABLE . '
WHERE forum_id = 0
AND user_id = ' . $user->data['user_id'];
$result = $db->sql_query($sql);
$track_data = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
}
switch (SQL_LAYER)
{
case 'oracle':
break;
default:
$sql_from = '(' . TOPICS_TABLE . ' t LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id'] . '))';
break;
}
$sql_select = ', tt.mark_type, tt.mark_time';
}
else
{
$sql_from = TOPICS_TABLE . ' t ';
$sql_select = '';
}
$tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_track'])) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_track'])) : array();
// Has to be in while loop if we not only check forum id 0
if ($config['load_db_lastread'])
{
$forum_check = $track_data['mark_time'];
}
else
{
$forum_check = (isset($tracking_topics[0][0])) ? base_convert($tracking_topics[0][0], 36, 10) + $config['board_startdate'] : 0;
}
*/
$sql_from = TOPICS_TABLE . ' t '; $sql_from = TOPICS_TABLE . ' t ';
$sql_select = ''; $sql_select = '';
@ -152,7 +107,6 @@ class ucp_main
$folder_new = 'folder_locked_new'; $folder_new = 'folder_locked_new';
} }
$newest_post_img = ($unread_topic) ? "<a href=\"{$phpbb_root_path}viewtopic.$phpEx$SID&amp;f=$g_forum_id&amp;t=$topic_id&amp;view=unread#unread\">" . $user->img('icon_post_newest', 'VIEW_NEWEST_POST') . '</a> ' : '';
$folder_img = ($unread_topic) ? $folder_new : $folder; $folder_img = ($unread_topic) ? $folder_new : $folder;
$folder_alt = ($unread_topic) ? 'NEW_POSTS' : (($row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_NEW_POSTS'); $folder_alt = ($unread_topic) ? 'NEW_POSTS' : (($row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_NEW_POSTS');
@ -162,27 +116,26 @@ class ucp_main
$folder_img .= '_posted'; $folder_img .= '_posted';
} }
$view_topic_url = "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;f=$g_forum_id&amp;t=$topic_id";
$last_post_img = "<a href=\"{$phpbb_root_path}viewtopic.$phpEx$SID&amp;f=$g_forum_id&amp;t=$topic_id&amp;p=" . $row['topic_last_post_id'] . '#' . $row['topic_last_post_id'] . '">' . $user->img('icon_post_latest', 'VIEW_LATEST_POST') . '</a>';
$last_post_author = ($row['topic_last_poster_id'] == ANONYMOUS) ? (($row['topic_last_poster_name'] != '') ? $row['topic_last_poster_name'] . ' ' : $user->lang['GUEST'] . ' ') : "<a href=\"{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['topic_last_poster_id'] . '">' . $row['topic_last_poster_name'] . '</a>';
$template->assign_block_vars('topicrow', array( $template->assign_block_vars('topicrow', array(
'FORUM_ID' => $forum_id, 'FORUM_ID' => $forum_id,
'TOPIC_ID' => $topic_id, 'TOPIC_ID' => $topic_id,
'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']), 'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']),
'LAST_POST_AUTHOR' => $last_post_author, 'LAST_POST_AUTHOR' => ($row['topic_last_poster_id'] == ANONYMOUS) ? (($row['topic_last_poster_name'] != '') ? $row['topic_last_poster_name'] . ' ' : $user->lang['GUEST'] . ' ') : $row['topic_last_poster_name'],
'TOPIC_TITLE' => censor_text($row['topic_title']), 'TOPIC_TITLE' => censor_text($row['topic_title']),
'TOPIC_TYPE' => $topic_type, 'TOPIC_TYPE' => $topic_type,
'LAST_POST_IMG' => $last_post_img, 'LAST_POST_IMG' => $user->img('icon_post_latest', 'VIEW_LATEST_POST'),
'NEWEST_POST_IMG' => $newest_post_img, 'NEWEST_POST_IMG' => $user->img('icon_post_newest', 'VIEW_NEWEST_POST'),
'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt), 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt),
'ATTACH_ICON_IMG' => ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', '') : '', 'ATTACH_ICON_IMG' => ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', '') : '',
'S_USER_POSTED' => (!empty($row['topic_posted']) && $row['topic_posted']) ? true : false, 'S_USER_POSTED' => (!empty($row['topic_posted']) && $row['topic_posted']) ? true : false,
'S_UNREAD' => $unread_topic,
'U_VIEW_TOPIC' => $view_topic_url) 'U_LAST_POST' => "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;f=$g_forum_id&amp;t=$topic_id&amp;p=" . $row['topic_last_post_id'] . '#' . $row['topic_last_post_id'],
'U_LAST_POST_AUTHOR'=> ($row['topic_last_poster_id'] != ANONYMOUS) ? "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['topic_last_poster_id'] : '',
'U_NEWEST_POST' => "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;f=$g_forum_id&amp;t=$topic_id&amp;view=unread#unread",
'U_VIEW_TOPIC' => "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;f=$g_forum_id&amp;t=$topic_id")
); );
} }
@ -291,9 +244,9 @@ class ucp_main
// 'S_GROUP_OPTIONS' => $group_options, // 'S_GROUP_OPTIONS' => $group_options,
'U_SEARCH_USER' => ($auth->acl_get('u_search')) ? "search.$phpEx$SID&amp;search_author=" . urlencode($user->data['username']) . "&amp;show_results=posts" : '', 'U_SEARCH_USER' => ($auth->acl_get('u_search')) ? "{$phpbb_root_path}search.$phpEx$SID&amp;search_author=" . urlencode($user->data['username']) . "&amp;show_results=posts" : '',
'U_ACTIVE_FORUM' => "viewforum.$phpEx$SID&amp;f=$active_f_id", 'U_ACTIVE_FORUM' => "{$phpbb_root_path}viewforum.$phpEx$SID&amp;f=$active_f_id",
'U_ACTIVE_TOPIC' => "viewtopic.$phpEx$SID&amp;t=$active_t_id",) 'U_ACTIVE_TOPIC' => "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;t=$active_t_id",)
); );
break; break;
@ -392,9 +345,9 @@ class ucp_main
$last_post_time = $user->format_date($row['forum_last_post_time']); $last_post_time = $user->format_date($row['forum_last_post_time']);
$last_poster = ($row['forum_last_poster_name'] != '') ? $row['forum_last_poster_name'] : $user->lang['GUEST']; $last_poster = ($row['forum_last_poster_name'] != '') ? $row['forum_last_poster_name'] : $user->lang['GUEST'];
$last_poster_url = ($row['forum_last_poster_id'] == ANONYMOUS) ? '' : "memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['forum_last_poster_id']; $last_poster_url = ($row['forum_last_poster_id'] == ANONYMOUS) ? '' : "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['forum_last_poster_id'];
$last_post_url = "viewtopic.$phpEx$SID&amp;f=$forum_id&amp;p=" . $row['forum_last_post_id'] . '#' . $row['forum_last_post_id']; $last_post_url = "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;f=$forum_id&amp;p=" . $row['forum_last_post_id'] . '#' . $row['forum_last_post_id'];
} }
else else
{ {
@ -412,7 +365,7 @@ class ucp_main
'U_LAST_POST_AUTHOR'=> $last_poster_url, 'U_LAST_POST_AUTHOR'=> $last_poster_url,
'U_LAST_POST' => $last_post_url, 'U_LAST_POST' => $last_post_url,
'U_VIEWFORUM' => "viewforum.$phpEx$SID&amp;f=" . $row['forum_id']) 'U_VIEWFORUM' => "{$phpbb_root_path}viewforum.$phpEx$SID&amp;f=" . $row['forum_id'])
); );
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -437,14 +390,6 @@ class ucp_main
); );
} }
/*
$sql_from = ($config['load_db_lastread'] || $config['load_db_track']) ? '(' . TOPICS_TABLE . ' t LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id'] . '))' : TOPICS_TABLE . ' t';
$sql_f_tracking = ($config['load_db_lastread']) ? 'LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.forum_id = t.forum_id AND ft.user_id = ' . $user->data['user_id'] . ')' : '';
$sql_t_select = ($config['load_db_lastread'] || $config['load_db_track']) ? ', tt.mark_type, tt.mark_time' : '';
$sql_f_select = ($config['load_db_lastread']) ? ', ft.mark_time AS forum_mark_time' : '';
*/
$sql_f_tracking = ($config['load_db_lastread']) ? 'LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.forum_id = t.forum_id AND ft.user_id = ' . $user->data['user_id'] . ')' : ''; $sql_f_tracking = ($config['load_db_lastread']) ? 'LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.forum_id = t.forum_id AND ft.user_id = ' . $user->data['user_id'] . ')' : '';
$sql_f_select = ($config['load_db_lastread']) ? ', ft.mark_time AS forum_mark_time' : ''; $sql_f_select = ($config['load_db_lastread']) ? ', ft.mark_time AS forum_mark_time' : '';
@ -512,8 +457,6 @@ class ucp_main
$folder_img = $folder_alt = $topic_type = ''; $folder_img = $folder_alt = $topic_type = '';
topic_status($row, $replies, $unread_topic, $folder_img, $folder_alt, $topic_type); topic_status($row, $replies, $unread_topic, $folder_img, $folder_alt, $topic_type);
$newest_post_img = ($unread_topic) ? "<a href=\"viewtopic.$phpEx$SID&amp;f=$forum_id&amp;t=$topic_id&amp;view=unread#unread\">" . $user->img('icon_post_newest', 'VIEW_NEWEST_POST') . '</a> ' : '';
$view_topic_url = "viewtopic.$phpEx$SID&amp;f=$forum_id&amp;t=$topic_id"; $view_topic_url = "viewtopic.$phpEx$SID&amp;f=$forum_id&amp;t=$topic_id";
// Send vars to template // Send vars to template
@ -532,7 +475,7 @@ class ucp_main
'TOPIC_TYPE' => $topic_type, 'TOPIC_TYPE' => $topic_type,
'LAST_POST_IMG' => $user->img('icon_post_latest', 'VIEW_LATEST_POST'), 'LAST_POST_IMG' => $user->img('icon_post_latest', 'VIEW_LATEST_POST'),
'NEWEST_POST_IMG' => $newest_post_img, 'NEWEST_POST_IMG' => $user->img('icon_post_newest', 'VIEW_NEWEST_POST'),
'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt), 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt),
'TOPIC_FOLDER_IMG_SRC' => $user->img($folder_img, $folder_alt, false, '', 'src'), 'TOPIC_FOLDER_IMG_SRC' => $user->img($folder_img, $folder_alt, false, '', 'src'),
'TOPIC_ICON_IMG' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '', 'TOPIC_ICON_IMG' => (!empty($icons[$row['icon_id']])) ? $icons[$row['icon_id']]['img'] : '',
@ -544,8 +487,9 @@ class ucp_main
'S_USER_POSTED' => (!empty($row['topic_posted'])) ? true : false, 'S_USER_POSTED' => (!empty($row['topic_posted'])) ? true : false,
'S_UNREAD_TOPIC' => $unread_topic, 'S_UNREAD_TOPIC' => $unread_topic,
'U_NEWEST_POST' => "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;f=$forum_id&amp;t=$topic_id&amp;view=unread#unread",
'U_LAST_POST' => $view_topic_url . '&amp;p=' . $row['topic_last_post_id'] . '#' . $row['topic_last_post_id'], 'U_LAST_POST' => $view_topic_url . '&amp;p=' . $row['topic_last_post_id'] . '#' . $row['topic_last_post_id'],
'U_LAST_POST_AUTHOR'=> ($row['topic_last_poster_id'] != ANONYMOUS && $row['topic_last_poster_id']) ? "memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u={$row['topic_last_poster_id']}" : '', 'U_LAST_POST_AUTHOR'=> ($row['topic_last_poster_id'] != ANONYMOUS && $row['topic_last_poster_id']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u={$row['topic_last_poster_id']}" : '',
'U_VIEW_TOPIC' => $view_topic_url) 'U_VIEW_TOPIC' => $view_topic_url)
); );
@ -595,7 +539,7 @@ class ucp_main
{ {
$s_hidden_fields = '<input type="hidden" name="unbookmark" value="1" />'; $s_hidden_fields = '<input type="hidden" name="unbookmark" value="1" />';
$topics = (isset($_POST['t'])) ? array_map('intval', array_keys($_POST['t'])) : array(); $topics = (isset($_POST['t'])) ? array_map('intval', array_keys($_POST['t'])) : array();
$url = "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=main&amp;mode=bookmarks"; $url = "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode";
if (!sizeof($topics)) if (!sizeof($topics))
{ {
@ -664,7 +608,6 @@ class ucp_main
$unread_topic = topic_status($row, $replies, time(), time(), $folder_img, $folder_alt, $topic_type); $unread_topic = topic_status($row, $replies, time(), time(), $folder_img, $folder_alt, $topic_type);
$view_topic_url = "viewtopic.$phpEx$SID&amp;f=$forum_id&amp;t=$topic_id"; $view_topic_url = "viewtopic.$phpEx$SID&amp;f=$forum_id&amp;t=$topic_id";
// $last_post_img = "<a href=\"viewtopic.$phpEx$SID&amp;f=$forum_id&amp;p=" . $row['topic_last_post_id'] . '#' . $row['topic_last_post_id'] . '">' . $user->img('icon_post_latest', 'VIEW_LATEST_POST') . '</a>';
$template->assign_block_vars('topicrow', array( $template->assign_block_vars('topicrow', array(
'FORUM_ID' => $forum_id, 'FORUM_ID' => $forum_id,
@ -688,7 +631,7 @@ class ucp_main
'LAST_POST_IMG' => $user->img('icon_post_latest', 'VIEW_LATEST_POST'), 'LAST_POST_IMG' => $user->img('icon_post_latest', 'VIEW_LATEST_POST'),
'U_LAST_POST' => $view_topic_url . '&amp;p=' . $row['topic_last_post_id'] . '#' . $row['topic_last_post_id'], 'U_LAST_POST' => $view_topic_url . '&amp;p=' . $row['topic_last_post_id'] . '#' . $row['topic_last_post_id'],
'U_LAST_POST_AUTHOR'=> ($row['topic_last_poster_id'] != ANONYMOUS && $row['topic_last_poster_id']) ? "memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u={$row['topic_last_poster_id']}" : '', 'U_LAST_POST_AUTHOR'=> ($row['topic_last_poster_id'] != ANONYMOUS && $row['topic_last_poster_id']) ? "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u={$row['topic_last_poster_id']}" : '',
'U_VIEW_TOPIC' => $view_topic_url, 'U_VIEW_TOPIC' => $view_topic_url,
'U_VIEW_FORUM' => "{$phpbb_root_path}viewforum.$phpEx$SID&amp;f=$forum_id}", 'U_VIEW_FORUM' => "{$phpbb_root_path}viewforum.$phpEx$SID&amp;f=$forum_id}",
'U_MOVE_UP' => ($row['order_id'] != 1) ? "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=main&amp;mode=bookmarks&amp;move_up={$row['order_id']}" : '', 'U_MOVE_UP' => ($row['order_id'] != 1) ? "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=main&amp;mode=bookmarks&amp;move_up={$row['order_id']}" : '',
@ -817,23 +760,23 @@ class ucp_main
if (isset($topic_rows[$draft['topic_id']]) && $auth->acl_get('f_read', $topic_rows[$draft['topic_id']]['forum_id'])) if (isset($topic_rows[$draft['topic_id']]) && $auth->acl_get('f_read', $topic_rows[$draft['topic_id']]['forum_id']))
{ {
$link_topic = true; $link_topic = true;
$view_url = "viewtopic.$phpEx$SID&amp;f=" . $topic_rows[$draft['topic_id']]['forum_id'] . "&amp;t=" . $draft['topic_id']; $view_url = "{$phpbb_root_path}viewtopic.$phpEx$SID&amp;f=" . $topic_rows[$draft['topic_id']]['forum_id'] . "&amp;t=" . $draft['topic_id'];
$title = $topic_rows[$draft['topic_id']]['topic_title']; $title = $topic_rows[$draft['topic_id']]['topic_title'];
$insert_url = "posting.$phpEx$SID&amp;f=" . $topic_rows[$draft['topic_id']]['forum_id'] . '&amp;t=' . $draft['topic_id'] . '&amp;mode=reply&amp;d=' . $draft['draft_id']; $insert_url = "{$phpbb_root_path}posting.$phpEx$SID&amp;f=" . $topic_rows[$draft['topic_id']]['forum_id'] . '&amp;t=' . $draft['topic_id'] . '&amp;mode=reply&amp;d=' . $draft['draft_id'];
} }
else if ($auth->acl_get('f_read', $draft['forum_id'])) else if ($auth->acl_get('f_read', $draft['forum_id']))
{ {
$link_forum = true; $link_forum = true;
$view_url = "viewforum.$phpEx$SID&amp;f=" . $draft['forum_id']; $view_url = "{$phpbb_root_path}viewforum.$phpEx$SID&amp;f=" . $draft['forum_id'];
$title = $draft['forum_name']; $title = $draft['forum_name'];
$insert_url = "posting.$phpEx$SID&amp;f=" . $draft['forum_id'] . '&amp;mode=post&amp;d=' . $draft['draft_id']; $insert_url = "{$phpbb_root_path}posting.$phpEx$SID&amp;f=" . $draft['forum_id'] . '&amp;mode=post&amp;d=' . $draft['draft_id'];
} }
else if ($pm_drafts) else if ($pm_drafts)
{ {
$link_pm = true; $link_pm = true;
$insert_url = "ucp.$phpEx$SID&amp;i=$id&amp;mode=compose&amp;d=" . $draft['draft_id']; $insert_url = "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=$id&amp;mode=compose&amp;d=" . $draft['draft_id'];
} }
$template_row = array( $template_row = array(
@ -847,7 +790,7 @@ class ucp_main
'TOPIC_ID' => $draft['topic_id'], 'TOPIC_ID' => $draft['topic_id'],
'U_VIEW' => $view_url, 'U_VIEW' => $view_url,
'U_VIEW_EDIT' => "ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode&amp;edit=" . $draft['draft_id'], 'U_VIEW_EDIT' => "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode&amp;edit=" . $draft['draft_id'],
'U_INSERT' => $insert_url, 'U_INSERT' => $insert_url,
'S_LINK_TOPIC' => $link_topic, 'S_LINK_TOPIC' => $link_topic,
@ -882,4 +825,33 @@ class ucp_main
} }
} }
/**
* @package module_install
*/
class ucp_main_info
{
function module()
{
return array(
'filename' => 'ucp_main',
'title' => 'UCP_MAIN',
'version' => '1.0.0',
'modes' => array(
'front' => array('title' => 'UCP_MAIN_FRONT', 'auth' => ''),
'subscribed' => array('title' => 'UCP_MAIN_SUBSCRIBED', 'auth' => ''),
'bookmarks' => array('title' => 'UCP_MAIN_BOOKMARKS', 'auth' => 'cfg_allow_bookmarks'),
'drafts' => array('title' => 'UCP_MAIN_DRAFTS', 'auth' => ''),
),
);
}
function install()
{
}
function uninstall()
{
}
}
?> ?>

51
phpBB/includes/ucp/ucp_prefs.php
View file

@ -126,6 +126,26 @@ class ucp_prefs
$style = (isset($style)) ? $style : $user->data['user_style']; $style = (isset($style)) ? $style : $user->data['user_style'];
$tz = (isset($tz)) ? $tz : $user->data['user_timezone']; $tz = (isset($tz)) ? $tz : $user->data['user_timezone'];
$dateformat_options = '';
foreach ($user->lang['dateformats'] as $format => $null)
{
$dateformat_options .= '<option value="' . $format . '"' . (($format == $dateformat) ? ' selected="selected"' : '') . '>';
$dateformat_options .= $user->format_date(time(), $format, true) . ((strpos($format, '|') !== false) ? ' [' . $user->lang['RELATIVE_DAYS'] . ']' : '');
$dateformat_options .= '</option>';
}
$s_custom = false;
$dateformat_options .= '<option value="custom"';
if (!in_array($dateformat, array_keys($user->lang['dateformats'])))
{
$dateformat_options .= ' selected="selected"';
$s_custom = true;
}
$dateformat_options .= '>' . $user->lang['CUSTOM_DATEFORMAT'] . '</option>';
$template->assign_vars(array( $template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '', 'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
@ -150,6 +170,9 @@ class ucp_prefs
'NOTIFY_BOTH' => ($notifymethod == NOTIFY_BOTH) ? 'checked="checked"' : '', 'NOTIFY_BOTH' => ($notifymethod == NOTIFY_BOTH) ? 'checked="checked"' : '',
'DATE_FORMAT' => $dateformat, 'DATE_FORMAT' => $dateformat,
'S_DATEFORMAT_OPTIONS' => $dateformat_options,
'S_CUSTOM_DATEFORMAT' => $s_custom,
'DEFAULT_DATEFORMAT' => $config['default_dateformat'],
'S_LANG_OPTIONS' => language_select($lang), 'S_LANG_OPTIONS' => language_select($lang),
'S_STYLE_OPTIONS' => style_select($style), 'S_STYLE_OPTIONS' => style_select($style),
@ -417,4 +440,32 @@ class ucp_prefs
} }
} }
/**
* @package module_install
*/
class ucp_prefs_info
{
function module()
{
return array(
'filename' => 'ucp_prefs',
'title' => 'UCP_PREFS',
'version' => '1.0.0',
'modes' => array(
'personal' => array('title' => 'UCP_PREFS_PERSONAL', 'auth' => ''),
'view' => array('title' => 'UCP_PREFS_VIEW', 'auth' => ''),
'post' => array('title' => 'UCP_PREFS_POST', 'auth' => ''),
),
);
}
function install()
{
}
function uninstall()
{
}
}
?> ?>

29
phpBB/includes/ucp/ucp_profile.php
View file

@ -654,4 +654,33 @@ class ucp_profile
} }
} }
/**
* @package module_install
*/
class ucp_profile_info
{
function module()
{
return array(
'filename' => 'ucp_profile',
'title' => 'UCP_PROFILE',
'version' => '1.0.0',
'modes' => array(
'reg_details' => array('title' => 'UCP_PROFILE_REG_DETAILS', 'auth' => ''),
'profile_info' => array('title' => 'UCP_PROFILE_PROFILE_INFO', 'auth' => ''),
'signature' => array('title' => 'UCP_PROFILE_SIGNATURE', 'auth' => ''),
'avatar' => array('title' => 'UCP_PROFILE_AVATAR', 'auth' => ''),
),
);
}
function install()
{
}
function uninstall()
{
}
}
?> ?>

35
phpBB/includes/ucp/ucp_zebra.php
View file

@ -18,13 +18,13 @@ class ucp_zebra
{ {
global $config, $db, $user, $auth, $SID, $template, $phpbb_root_path, $phpEx; global $config, $db, $user, $auth, $SID, $template, $phpbb_root_path, $phpEx;
$submit = (!empty($_POST['submit']) || !empty($_GET['add'])) ? true : false; $submit = (isset($_POST['submit']) || isset($_GET['add'])) ? true : false;
$s_hidden_fields = ''; $s_hidden_fields = '';
if ($submit) if ($submit)
{ {
$var_ary = array( $var_ary = array(
'usernames' => 0, 'usernames' => array(0),
'add' => '', 'add' => '',
); );
@ -195,15 +195,42 @@ class ucp_zebra
$template->assign_vars(array( $template->assign_vars(array(
'L_TITLE' => $user->lang['UCP_ZEBRA_' . strtoupper($mode)], 'L_TITLE' => $user->lang['UCP_ZEBRA_' . strtoupper($mode)],
'U_SEARCH_USER' => "memberlist.$phpEx$SID&amp;mode=searchuser&amp;form=ucp&amp;field=add", 'U_SEARCH_USER' => "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=searchuser&amp;form=ucp&amp;field=add",
'S_USERNAME_OPTIONS' => $s_username_options, 'S_USERNAME_OPTIONS' => $s_username_options,
'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_HIDDEN_FIELDS' => $s_hidden_fields,
'S_UCP_ACTION' => "ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode") 'S_UCP_ACTION' => "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode")
); );
$this->tpl_name = 'ucp_zebra_' . $mode; $this->tpl_name = 'ucp_zebra_' . $mode;
} }
} }
/**
* @package module_install
*/
class ucp_zebra_info
{
function module()
{
return array(
'filename' => 'ucp_zebra',
'title' => 'UCP_ZEBRA',
'version' => '1.0.0',
'modes' => array(
'friends' => array('title' => 'UCP_ZEBRA_FRIENDS', 'auth' => ''),
'foes' => array('title' => 'UCP_ZEBRA_FOES', 'auth' => ''),
),
);
}
function install()
{
}
function uninstall()
{
}
}
?> ?>

23
phpBB/language/en/common.php
View file

@ -99,6 +99,7 @@ $lang += array(
'DELETE_ALL' => 'Delete All', 'DELETE_ALL' => 'Delete All',
'DELETE_COOKIES' => 'Delete all board cookies', 'DELETE_COOKIES' => 'Delete all board cookies',
'DELETE_MARKED' => 'Delete Marked', 'DELETE_MARKED' => 'Delete Marked',
'DELETE_POST' => 'Delete Post',
'DESCENDING' => 'Descending', 'DESCENDING' => 'Descending',
'DISABLED' => 'Disabled', 'DISABLED' => 'Disabled',
'DISPLAY' => 'Display', 'DISPLAY' => 'Display',
@ -111,6 +112,7 @@ $lang += array(
'DOWNLOAD_COUNTS' => '%d Times', 'DOWNLOAD_COUNTS' => '%d Times',
'DOWNLOAD_NONE' => '0 Times', 'DOWNLOAD_NONE' => '0 Times',
'EDIT_POST' => 'Edit Post',
'EMAIL' => 'Email', 'EMAIL' => 'Email',
'EMAIL_ADDRESS' => 'Email address', 'EMAIL_ADDRESS' => 'Email address',
'EMPTY_SUBJECT' => 'You must specify a subject when posting a new topic.', 'EMPTY_SUBJECT' => 'You must specify a subject when posting a new topic.',
@ -146,7 +148,7 @@ $lang += array(
'GUEST_USERS_ONLINE' => 'There are %d Guest users online', 'GUEST_USERS_ONLINE' => 'There are %d Guest users online',
'GUEST_USERS_TOTAL' => '%d Guests', 'GUEST_USERS_TOTAL' => '%d Guests',
'GUEST_USERS_ZERO_ONLINE' => 'There are 0 Guest users online', 'GUEST_USERS_ZERO_ONLINE' => 'There are 0 Guest users online',
'GUEST_USERS_ZERO_TOTAL'=> '0 Guests', 'GUEST_USERS_ZERO_TOTAL' => '0 Guests',
'GUEST_USER_ONLINE' => 'There is %d Guest user online', 'GUEST_USER_ONLINE' => 'There is %d Guest user online',
'GUEST_USER_TOTAL' => '%d Guest', 'GUEST_USER_TOTAL' => '%d Guest',
'G_ADMINISTRATORS' => 'Administrators', 'G_ADMINISTRATORS' => 'Administrators',
@ -261,7 +263,7 @@ $lang += array(
'OFFLINE' => 'Offline', 'OFFLINE' => 'Offline',
'ONLINE' => 'Online', 'ONLINE' => 'Online',
'ONLINE_BUDDIES' => 'Online Buddies', 'ONLINE_BUDDIES' => 'Online Buddies',
'ONLINE_USERS_TOTAL'=> 'In total there are <b>%d</b> users online :: ', 'ONLINE_USERS_TOTAL' => 'In total there are <b>%d</b> users online :: ',
'ONLINE_USERS_ZERO_TOTAL' => 'In total there are <b>0</b> users online :: ', 'ONLINE_USERS_ZERO_TOTAL' => 'In total there are <b>0</b> users online :: ',
'ONLINE_USER_TOTAL' => 'In total there is <b>%d</b> user online :: ', 'ONLINE_USER_TOTAL' => 'In total there is <b>%d</b> user online :: ',
'OPTIONS' => 'Options', 'OPTIONS' => 'Options',
@ -278,6 +280,7 @@ $lang += array(
'POST_BY_FOE' => 'This post was made by <b>%1$s</b> who is currently on your ignore list. To display this post click %2$sHERE%3$s.', 'POST_BY_FOE' => 'This post was made by <b>%1$s</b> who is currently on your ignore list. To display this post click %2$sHERE%3$s.',
'POST_DAY' => '%.2f posts per day', 'POST_DAY' => '%.2f posts per day',
'POST_DETAILS' => 'Post Details', 'POST_DETAILS' => 'Post Details',
'POST_NEW_TOPIC' => 'Post new topic',
'POST_PCT' => '%.2f%% of all posts', 'POST_PCT' => '%.2f%% of all posts',
'POST_REPORTED' => 'Click to view reports', 'POST_REPORTED' => 'Click to view reports',
'POST_SUBJECT' => 'Post Subject', 'POST_SUBJECT' => 'Post Subject',
@ -312,6 +315,7 @@ $lang += array(
'REPLY_WITH_QUOTE' => 'Reply with quote', 'REPLY_WITH_QUOTE' => 'Reply with quote',
'REPLYING_GLOBAL_ANNOUNCE' => 'Replying to global announcement', 'REPLYING_GLOBAL_ANNOUNCE' => 'Replying to global announcement',
'REPLYING_MESSAGE' => 'Replying to message in %s', 'REPLYING_MESSAGE' => 'Replying to message in %s',
'REPORT_POST' => 'Report this post',
'RESEND_ACTIVATION' => 'Resend activation email', 'RESEND_ACTIVATION' => 'Resend activation email',
'RESET' => 'Reset', 'RESET' => 'Reset',
'RETURN_INDEX' => 'Click %sHere%s to return to the index', 'RETURN_INDEX' => 'Click %sHere%s to return to the index',
@ -331,7 +335,7 @@ $lang += array(
'RULES_POST_CAN' => 'You <b>can</b> post new topics in this forum', 'RULES_POST_CAN' => 'You <b>can</b> post new topics in this forum',
'RULES_POST_CANNOT' => 'You <b>cannot</b> post new topics in this forum', 'RULES_POST_CANNOT' => 'You <b>cannot</b> post new topics in this forum',
'RULES_REPLY_CAN' => 'You <b>can</b> reply to topics in this forum', 'RULES_REPLY_CAN' => 'You <b>can</b> reply to topics in this forum',
'RULES_REPLY_CANNOT'=> 'You <b>cannot</b> reply to topics in this forum', 'RULES_REPLY_CANNOT' => 'You <b>cannot</b> reply to topics in this forum',
'RULES_VOTE_CAN' => 'You <b>can</b> vote in polls in this forum', 'RULES_VOTE_CAN' => 'You <b>can</b> vote in polls in this forum',
'RULES_VOTE_CANNOT' => 'You <b>cannot</b> vote in polls in this forum', 'RULES_VOTE_CANNOT' => 'You <b>cannot</b> vote in polls in this forum',
@ -345,6 +349,8 @@ $lang += array(
'SEARCH_UNANSWERED' => 'View unanswered posts', 'SEARCH_UNANSWERED' => 'View unanswered posts',
'SELECT' => 'Select', 'SELECT' => 'Select',
'SELECT_FORUM' => 'Select a forum', 'SELECT_FORUM' => 'Select a forum',
'SEND_EMAIL' => 'Email',
'SEND_PRIVATE_MESSAGE' => 'Send private message',
'SIGNATURE' => 'Signature', 'SIGNATURE' => 'Signature',
'SORRY_AUTH_READ' => 'You are not authorized to read this forum', 'SORRY_AUTH_READ' => 'You are not authorized to read this forum',
'SORT_BY' => 'Sort by', 'SORT_BY' => 'Sort by',
@ -560,6 +566,17 @@ $lang += array(
'12' => '[GMT+12] Auckland, Fiji, Kamchatka, Marshall Is., Suva, Wellington' '12' => '[GMT+12] Auckland, Fiji, Kamchatka, Marshall Is., Suva, Wellington'
), ),
), ),
// The value is only an example and will get replaced by the current time on view
'dateformats' => array(
'|d M Y| H:i' => '10 Jan 2005 17:54 [Relative days]',
'd M Y, H:i' => '10 Jan 2005, 17:57',
'd M Y H:i' => '10 Jan 2005 17:57',
'D M d, Y g:i a' => 'Mon Jan 10, 2005 5:57 pm',
'M j, y, H:i' => 'Jan 10, 05, 5:57 pm',
'F j, Y, g:i a' => 'January 10, 2005, 5:57 pm'
),
); );
?> ?>

1
phpBB/language/en/mcp.php
View file

@ -189,7 +189,6 @@ $lang += array(
'REPORT_MESSAGE_EXPLAIN'=> 'Use this form to report the selected message to the board administrators. Reporting should generally be used only if the message breaks forum rules.', 'REPORT_MESSAGE_EXPLAIN'=> 'Use this form to report the selected message to the board administrators. Reporting should generally be used only if the message breaks forum rules.',
'REPORT_NOTIFY' => 'Notify me', 'REPORT_NOTIFY' => 'Notify me',
'REPORT_NOTIFY_EXPLAIN' => 'Informs you when your report is dealt with', 'REPORT_NOTIFY_EXPLAIN' => 'Informs you when your report is dealt with',
'REPORT_POST' => 'Report this post',
'REPORT_POST_EXPLAIN' => 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.', 'REPORT_POST_EXPLAIN' => 'Use this form to report the selected post to the forum moderators and board administrators. Reporting should generally be used only if the post breaks forum rules.',
'REPORT_TOTAL' => 'In total there is <b>1</b> report to review', 'REPORT_TOTAL' => 'In total there is <b>1</b> report to review',
'RESYNC' => 'Resync', 'RESYNC' => 'Resync',

1
phpBB/language/en/memberlist.php
View file

@ -103,7 +103,6 @@ $lang += array(
'SEARCH_USER_POSTS' => 'Search users posts', 'SEARCH_USER_POSTS' => 'Search users posts',
'SELECT_MARKED' => 'Select Marked', 'SELECT_MARKED' => 'Select Marked',
'SELECT_SORT_METHOD' => 'Select sort method', 'SELECT_SORT_METHOD' => 'Select sort method',
'SEND_EMAIL' => 'Email',
'SEND_IM' => 'Instant Messaging', 'SEND_IM' => 'Instant Messaging',
'SEND_MESSAGE' => 'Message', 'SEND_MESSAGE' => 'Message',
'SORT_EMAIL' => 'Email', 'SORT_EMAIL' => 'Email',

2
phpBB/language/en/posting.php
View file

@ -71,7 +71,6 @@ $lang += array(
'DELETE_MESSAGE' => 'Delete Message', 'DELETE_MESSAGE' => 'Delete Message',
'DELETE_MESSAGE_CONFIRM' => 'Are you sure you want to delete this message?', 'DELETE_MESSAGE_CONFIRM' => 'Are you sure you want to delete this message?',
'DELETE_OWN_POSTS' => 'Sorry but you can only delete your own posts.', 'DELETE_OWN_POSTS' => 'Sorry but you can only delete your own posts.',
'DELETE_POST' => 'Delete Post',
'DELETE_POST_CONFIRM' => 'Are you sure you want to delete this message?', 'DELETE_POST_CONFIRM' => 'Are you sure you want to delete this message?',
'DELETE_POST_WARN' => 'Once deleted the post cannot be recovered', 'DELETE_POST_WARN' => 'Once deleted the post cannot be recovered',
'DISABLE_BBCODE' => 'Disable BBCode', 'DISABLE_BBCODE' => 'Disable BBCode',
@ -83,7 +82,6 @@ $lang += array(
'DRAFT_SAVED' => 'Draft successfully saved.', 'DRAFT_SAVED' => 'Draft successfully saved.',
'DRAFT_TITLE' => 'Draft Title', 'DRAFT_TITLE' => 'Draft Title',
'EDIT_POST' => 'Edit Post',
'EDIT_REASON' => 'Reason for editing this post', 'EDIT_REASON' => 'Reason for editing this post',
'EMPTY_FILEUPLOAD' => 'The uploaded file is empty', 'EMPTY_FILEUPLOAD' => 'The uploaded file is empty',
'EMPTY_MESSAGE' => 'You must enter a message when posting.', 'EMPTY_MESSAGE' => 'You must enter a message when posting.',

5
phpBB/language/en/ucp.php
View file

@ -94,6 +94,7 @@ $lang += array(
'CURRENT_PASSWORD' => 'Current password', 'CURRENT_PASSWORD' => 'Current password',
'CURRENT_PASSWORD_EXPLAIN' => 'You must confirm your current password if you wish to change it, alter your email address or username.', 'CURRENT_PASSWORD_EXPLAIN' => 'You must confirm your current password if you wish to change it, alter your email address or username.',
'CUR_PASSWORD_ERROR' => 'The current password you entered is incorrect.', 'CUR_PASSWORD_ERROR' => 'The current password you entered is incorrect.',
'CUSTOM_DATEFORMAT' => 'Custom...',
'DEFAULT_ACTION' => 'Default Action', 'DEFAULT_ACTION' => 'Default Action',
'DEFAULT_ACTION_EXPLAIN' => 'This Action will be triggered if none of the above is applicable', 'DEFAULT_ACTION_EXPLAIN' => 'This Action will be triggered if none of the above is applicable',
@ -275,6 +276,7 @@ $lang += array(
'RECIPIENT' => 'Recipient', 'RECIPIENT' => 'Recipient',
'RECIPIENTS' => 'Recipients', 'RECIPIENTS' => 'Recipients',
'REGISTRATION' => 'Registration', 'REGISTRATION' => 'Registration',
'RELATIVE_DAYS' => 'Relative days',
'RELEASE_MESSAGES' => 'Click %sHere%s to release the on-hold messages, they will be re-sorted into the appropiate folder if enough space is made available.', 'RELEASE_MESSAGES' => 'Click %sHere%s to release the on-hold messages, they will be re-sorted into the appropiate folder if enough space is made available.',
'REMOVE_ADDRESS' => 'Remove address', 'REMOVE_ADDRESS' => 'Remove address',
'REMOVE_SELECTED_BOOKMARKS' => 'Remove selected bookmarks', 'REMOVE_SELECTED_BOOKMARKS' => 'Remove selected bookmarks',
@ -317,6 +319,7 @@ $lang += array(
'TOO_MANY_REGISTERS' => 'You have exceeded the maximum number of registration attempts for this session. Please try again later.', 'TOO_MANY_REGISTERS' => 'You have exceeded the maximum number of registration attempts for this session. Please try again later.',
'UCP' => 'User Control Panel', 'UCP' => 'User Control Panel',
'UCP_ACTIVATE' => 'Activate account',
'UCP_ADMIN_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will an email at the address you specified.', 'UCP_ADMIN_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will an email at the address you specified.',
'UCP_AIM' => 'AOL Instant Messenger', 'UCP_AIM' => 'AOL Instant Messenger',
'UCP_ATTACHMENTS' => 'Attachments', 'UCP_ATTACHMENTS' => 'Attachments',
@ -445,8 +448,6 @@ $lang += array(
), ),
'UCP_GROUPS_MEMBERSHIP' => 'Memberships',
'UCP_GROUPS_MANAGE' => 'Manage groups',
'GROUPS_EXPLAIN' => 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you extra rights to view content or increase your capabilities in other areas.', 'GROUPS_EXPLAIN' => 'Usergroups enable board admins to better administer users. By default you will be placed in a specific group, this is your default group. This group defines how you may appear to other users, for example your username colouration, avatar, rank, etc. Depending on whether the administrator allows it you may be allowed to change your default group. You may also be placed in or allowed to join other groups. Some groups may give you extra rights to view content or increase your capabilities in other areas.',
'GROUP_LEADER' => 'Leaderships', 'GROUP_LEADER' => 'Leaderships',
'GROUP_MEMBER' => 'Memberships', 'GROUP_MEMBER' => 'Memberships',

1
phpBB/language/en/viewforum.php
View file

@ -46,7 +46,6 @@ $lang += array(
'NO_NEW_POSTS_LOCKED' => 'No new posts [ Locked ]', 'NO_NEW_POSTS_LOCKED' => 'No new posts [ Locked ]',
'POST_FORUM_LOCKED' => 'Forum is locked', 'POST_FORUM_LOCKED' => 'Forum is locked',
'POST_NEW_TOPIC' => 'Post new topic',
'TOPICS_MARKED' => 'The topics for this forum have now been marked read', 'TOPICS_MARKED' => 'The topics for this forum have now been marked read',

2
phpBB/styles/subSilver/template/overall_footer.html
View file

@ -16,7 +16,7 @@
<!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF --> <!-- IF U_ACP --><span class="gensmall">[ <a href="{U_ACP}">{L_ACP}</a> ]</span><br /><br /><!-- ENDIF -->
<span class="copyright">Powered by <a href="http://www.phpbb.com/" target="_phpbb">phpBB</a> &copy; 2002, 2005 phpBB Group<br />{TRANSLATION_INFO}<!-- IF DEBUG_OUTPUT --><br />[ {DEBUG_OUTPUT} ]<!-- ENDIF --></span> <span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; 2002, 2005 phpBB Group<br />{TRANSLATION_INFO}<!-- IF DEBUG_OUTPUT --><br />[ {DEBUG_OUTPUT} ]<!-- ENDIF --></span>
</div> </div>

13
phpBB/styles/subSilver/template/ucp_main_front.html
View file

@ -23,24 +23,23 @@
<td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td> <td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
<td class="row1" width="100%"> <td class="row1" width="100%">
<p class="topictitle">{topicrow.NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p><p class="gensmall">{topicrow.GOTO_PAGE}</p></td> <p class="topictitle"><!-- IF topicrow.S_UNREAD --><a href="{topicrow.U_NEWEST_POST}">{topicrow.NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p><p class="gensmall">{topicrow.GOTO_PAGE}</p>
<!-- td class="row2" width="100" align="center"><p class="topicauthor">{topicrow.TOPIC_AUTHOR}</p></td --> </td>
<td class="row1" width="120" align="center" nowrap="nowrap"> <td class="row1" width="120" align="center" nowrap="nowrap">
<p class="topicdetails">{topicrow.LAST_POST_TIME}</p> <p class="topicdetails">{topicrow.LAST_POST_TIME}</p>
<p class="topicdetails"> <p class="topicdetails">
<!-- IF forumrow.U_LAST_POSTER --> <!-- IF topicrow.U_LAST_POST_AUTHOR -->
<a href="{forumrow.U_LAST_POST_AUTHOR}">{topicrow.LAST_POST_AUTHOR}</a> <a href="{topicrow.U_LAST_POST_AUTHOR}">{topicrow.LAST_POST_AUTHOR}</a>
<!-- ELSE --> <!-- ELSE -->
{topicrow.LAST_POST_AUTHOR} {topicrow.LAST_POST_AUTHOR}
<!-- ENDIF --> <!-- ENDIF -->
<a href="{forumrow.U_LAST_POST}">{topicrow.LAST_POST_IMG}</a> <a href="{topicrow.U_LAST_POST}">{topicrow.LAST_POST_IMG}</a>
</p> </p>
</td> </td>
</tr> </tr>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<tr class="row1"> <tr class="row1">
<td align="center"><b class="gen">{L_NO_IMPORTANT_NEWS}</b></td> <td align="center" colspan="3"><b class="gen">{L_NO_IMPORTANT_NEWS}</b></td>
</tr> </tr>
<!-- END topicrow --> <!-- END topicrow -->

2
phpBB/styles/subSilver/template/ucp_main_subscribed.html
View file

@ -60,7 +60,7 @@
<td style="padding: 4px;" width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td> <td style="padding: 4px;" width="20" align="center" valign="middle">{topicrow.TOPIC_FOLDER_IMG}</td>
<td style="padding: 4px;" width="100%" valign="top"> <td style="padding: 4px;" width="100%" valign="top">
<p class="topictitle">{topicrow.NEWEST_POST_IMG} {topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p><br /> <p class="topictitle"><!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}">{topicrow.NEWEST_POST_IMG}</a> <!-- ENDIF -->{topicrow.ATTACH_ICON_IMG} <a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></p><br />
<!-- IF topicrow.PAGINATION --> <!-- IF topicrow.PAGINATION -->
<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ] </p> <p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {topicrow.PAGINATION} ] </p>
<!-- ENDIF --> <!-- ENDIF -->

19
phpBB/styles/subSilver/template/ucp_prefs_personal.html
View file

@ -2,6 +2,18 @@
<!-- $Id$ --> <!-- $Id$ -->
<script type="text/javascript">
<!--
// Set display of page element
// s[-1,0,1] = hide,toggle display,show
function dE(n,s){
var e = document.getElementById(n);
if(!s) s = (e.style.display=='') ? -1:1;
e.style.display = (s==1) ? 'block':'none';
}
//-->
</script>
<table class="tablebg" width="100%" cellspacing="1"> <table class="tablebg" width="100%" cellspacing="1">
<tr> <tr>
<th colspan="2" valign="middle">{L_TITLE}</th> <th colspan="2" valign="middle">{L_TITLE}</th>
@ -65,7 +77,12 @@
</tr> </tr>
<tr> <tr>
<td class="row1" width="50%"><b class="genmed">{L_BOARD_DATE_FORMAT}:</b><br /><span class="gensmall">{L_BOARD_DATE_FORMAT_EXPLAIN}</span></td> <td class="row1" width="50%"><b class="genmed">{L_BOARD_DATE_FORMAT}:</b><br /><span class="gensmall">{L_BOARD_DATE_FORMAT_EXPLAIN}</span></td>
<td class="row2"><input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="14" class="post" /></td> <td class="row2">
<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = '{DEFAULT_DATEFORMAT}'; } else { document.getElementById('dateformat').value = this.value; }">
{S_DATEFORMAT_OPTIONS}
</select>
<div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="14" class="post" style="margin-top: 3px;" /></div>
</td>
</tr> </tr>
<tr> <tr>
<td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td> <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="{L_RESET}" name="reset" /></td>

4
phpBB/styles/subSilver/template/viewforum_body.html
View file

@ -39,7 +39,7 @@
<tr> <tr>
<td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td> <td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
<!-- IF S_TOPIC_ICONS --> <!-- IF S_TOPIC_ICONS -->
<td class="row1" width="25" align="center"><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /></td> <td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td>
<!-- ENDIF --> <!-- ENDIF -->
<td class="row1"> <td class="row1">
<!-- IF topicrow.S_TOPIC_UNAPPROVED --> <!-- IF topicrow.S_TOPIC_UNAPPROVED -->
@ -158,7 +158,7 @@
<tr> <tr>
<td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td> <td class="row1" width="25" align="center">{topicrow.TOPIC_FOLDER_IMG}</td>
<!-- IF S_TOPIC_ICONS --> <!-- IF S_TOPIC_ICONS -->
<td class="row1" width="25" align="center"><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /></td> <td class="row1" width="25" align="center"><!-- IF topicrow.TOPIC_ICON_IMG --><img src="{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}" width="{topicrow.TOPIC_ICON_IMG_WIDTH}" height="{topicrow.TOPIC_ICON_IMG_HEIGHT}" alt="" title="" /><!-- ENDIF --></td>
<!-- ENDIF --> <!-- ENDIF -->
<td class="row1"> <td class="row1">
<!-- IF topicrow.S_TOPIC_UNAPPROVED --> <!-- IF topicrow.S_TOPIC_UNAPPROVED -->