mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-18 06:38:43 +01:00
Code Issues Releases Wiki Activity

checking in some fixes... also added "previous/next pm in history" links to prosilvers private message view; dhn, you may want to have a look at the placement. :)

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@7322 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-04-10 20:50:14 +00:00
parent 067f80eccc
commit e70cea16b9
18 changed files with 54 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/acp/acp_board.php
View File

@ -114,7 +114,7 @@ class acp_board
'pm_max_boxes' => array('lang' => 'BOXES_MAX', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => true),
'pm_max_msgs' => array('lang' => 'BOXES_LIMIT', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => true),
'full_folder_action' => array('lang' => 'FULL_FOLDER_ACTION', 'validate' => 'int', 'type' => 'select', 'method' => 'full_folder_select', 'explain' => true),
'pm_edit_time' => array('lang' => 'PM_EDIT_TIME', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
'pm_edit_time' => array('lang' => 'PM_EDIT_TIME', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
'legend2' => 'GENERAL_OPTIONS',
'allow_mass_pm' => array('lang' => 'ALLOW_MASS_PM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
@ -147,9 +147,9 @@ class acp_board
'legend2' => 'POSTING',
'bump_type' => false,
'edit_time' => array('lang' => 'EDIT_TIME', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
'edit_time' => array('lang' => 'EDIT_TIME', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
'display_last_edited' => array('lang' => 'DISPLAY_LAST_EDITED', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'flood_interval' => array('lang' => 'FLOOD_INTERVAL', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
'flood_interval' => array('lang' => 'FLOOD_INTERVAL', 'validate' => 'int', 'type' => 'text:3:10', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
'bump_interval' => array('lang' => 'BUMP_INTERVAL', 'validate' => 'int', 'type' => 'custom', 'method' => 'bump_interval', 'explain' => true),
'topics_per_page' => array('lang' => 'TOPICS_PER_PAGE', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => false),
'posts_per_page' => array('lang' => 'POSTS_PER_PAGE', 'validate' => 'int', 'type' => 'text:3:4', 'explain' => false),
@ -238,7 +238,7 @@ class acp_board
'vars' => array(
'legend1' => 'GENERAL_SETTINGS',
'limit_load' => array('lang' => 'LIMIT_LOAD', 'validate' => 'string', 'type' => 'text:4:4', 'explain' => true),
'session_length' => array('lang' => 'SESSION_LENGTH', 'validate' => 'int', 'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
'session_length' => array('lang' => 'SESSION_LENGTH', 'validate' => 'int', 'type' => 'text:5:10', 'explain' => true, 'append' => ' ' . $user->lang['SECONDS']),
'active_sessions' => array('lang' => 'LIMIT_SESSIONS', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => true),
'load_online_time' => array('lang' => 'ONLINE_LENGTH', 'validate' => 'int', 'type' => 'text:4:3', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),

2
phpBB/includes/functions_convert.php
View File

@ -1194,7 +1194,7 @@ function restore_config($schema)
{
if (preg_match('/(.*)\((.*)\)/', $src, $m))
{
$var = (empty($m[2]) || empty($convert_config[$m[2]])) ? '' : "'" . addslashes($convert_config[$m[2]]) . "'";
$var = (empty($m[2]) || empty($convert_config[$m[2]])) ? "''" : "'" . addslashes($convert_config[$m[2]]) . "'";
$exec = '$config_value = ' . $m[1] . '(' . $var . ');';
eval($exec);
}

2
phpBB/includes/ucp/ucp_pm_compose.php
View File

@ -556,7 +556,7 @@ function compose_pm($id, $mode, $action)
'from_user_id' => $user->data['user_id'],
'from_user_ip' => $user->data['user_ip'],
'from_username' => $user->data['username'],
'reply_from_root_level' => (isset($root_level)) ? (int) $root_level : 0,
'reply_from_root_level' => (isset($post['root_level'])) ? (int) $post['root_level'] : 0,
'reply_from_msg_id' => (int) $msg_id,
'icon_id' => (int) $icon_id,
'enable_sig' => (bool) $enable_sig,

7
phpBB/includes/ucp/ucp_pm_viewmessage.php
View File

@ -250,9 +250,7 @@ function message_history($msg_id, $user_id, $message_row, $folder)
{
$sql .= " AND (p.root_level = " . $message_row['root_level'] . ' OR p.msg_id = ' . $message_row['root_level'] . ')';
}
$sql .= ' ORDER BY p.message_time ';
$sort_dir = (!empty($user->data['user_sortby_dir'])) ? $user->data['user_sortby_dir'] : 'd';
$sql .= ($sort_dir == 'd') ? 'ASC' : 'DESC';
$sql .= ' ORDER BY p.message_time DESC';
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
@ -267,7 +265,6 @@ function message_history($msg_id, $user_id, $message_row, $folder)
$bbcode_bitfield = '';
$folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm') . '&folder=';
$title = ($sort_dir == 'd') ? $row['message_subject'] : '';
do
{
$folder_id = (int) $row['folder_id'];
@ -287,7 +284,7 @@ function message_history($msg_id, $user_id, $message_row, $folder)
while ($row = $db->sql_fetchrow($result));
$db->sql_freeresult($result);
$title = ($sort_dir == 'a') ? $row['message_subject'] : $title;
$title = $row['message_subject'];
if (sizeof($rowset) == 1)
{

3
phpBB/install/convertors/functions_phpbb20.php
View File

@ -1104,7 +1104,8 @@ function phpbb_convert_group_type($group_type)
break;
}
return GROUP_SPECIAL;
// Never return GROUP_SPECIAL here, because only phpBB3's default groups are allowed to have this type set.
return GROUP_HIDDEN;
}
/**

2
phpBB/language/en/common.php
View File

@ -397,9 +397,11 @@ $lang = array_merge($lang, array(
'POST_PCT' => '%.2f%% of all posts',
'POST_PCT_ACTIVE' => '%.2f%% of user’s posts',
'POST_PCT_ACTIVE_OWN' => '%.2f%% of your posts',
'POST_REPLY' => 'Post a reply',
'POST_REPORTED' => 'Click to view report',
'POST_SUBJECT' => 'Post subject',
'POST_TIME' => 'Post time',
'POST_TOPIC' => 'Post a new topic',
'POST_UNAPPROVED' => 'This post is waiting for approval',
'PREVIEW' => 'Preview',
'PREVIOUS' => 'Previous',

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

@ -219,6 +219,7 @@ $lang = array_merge($lang, array(
'NO_REPORTS' => 'No reports',
'NO_TOPIC_ICON' => 'None',
'NO_TOPIC_SELECTED' => 'You must select at least one topic to perform this action',
'NO_TOPICS_QUEUE' => 'No topics',
'ONLY_TOPIC' => 'Only topic "%s"',
'OTHER_USERS' => 'Users posting from this IP',

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

@ -155,12 +155,10 @@ $lang = array_merge($lang, array(
'POST_GLOBAL' => 'Global',
'POST_ICON' => 'Post icon',
'POST_NORMAL' => 'Normal',
'POST_REPLY' => 'Post a reply',
'POST_REVIEW' => 'Post review',
'POST_REVIEW_EXPLAIN' => 'At least one new post has been made to this topic. You may wish to review your post in light of this.',
'POST_STORED' => 'This message has been posted successfully',
'POST_STORED_MOD' => 'This message has been saved but requires approval',
'POST_TOPIC' => 'Post a new topic',
'POST_TOPIC_AS' => 'Post topic as',
'PROGRESS_BAR' => 'Progress bar',

2
phpBB/posting.php
View File

@ -1391,7 +1391,7 @@ function handle_post_delete($forum_id, $topic_id, $post_id, &$post_data)
}
// If we are here the user is not able to delete - present the correct error message
if ($post_data['poster_id'] != $user->data['user_id'] && !$auth->acl_get('f_delete', $forum_id))
if ($post_data['poster_id'] != $user->data['user_id'] && $auth->acl_get('f_delete', $forum_id))
{
trigger_error('DELETE_OWN_POSTS');
}

2
phpBB/styles/prosilver/template/mcp_queue.html
View File

@ -76,7 +76,7 @@
</li>
</ul>
<!-- ELSE -->
<p class="notopics"><strong>{L_NO_POSTS}</strong></p>
<p class="notopics"><strong><!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></strong></p>
<!-- ENDIF -->
<span class="corners-bottom"><span></span></span></div>

32
phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
View File

@ -76,15 +76,12 @@
<!-- ENDIF -->
<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
<fieldset class="display-options">
<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box left">{L_PREVIOUS}</a><!-- ENDIF -->
<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box right">{L_NEXT}</a><!-- ENDIF -->
<label>{L_DISPLAY}: {S_SELECT_SORT_DAYS}</label>
<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
<fieldset class="display-actions">
<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}: <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div>
<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" />
<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div>
</fieldset>
<hr />
<ul class="linklist">
@ -99,15 +96,18 @@
<span class="corners-bottom"><span></span></span></div>
</div>
<!-- IF .messagerow -->
<fieldset class="display-actions">
<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}: <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div>
<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" />
<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div>
</fieldset>
<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
<fieldset class="display-options">
<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box left">{L_PREVIOUS}</a><!-- ENDIF -->
<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box right">{L_NEXT}</a><!-- ENDIF -->
<label>{L_DISPLAY}: {S_SELECT_SORT_DAYS}</label>
<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label>
<label>{S_SELECT_SORT_DIR} <input type="submit" name="sort" value="{L_GO}" class="button2" /></label>
<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
</fieldset>
<!-- ENDIF -->
<!-- INCLUDE ucp_pm_message_footer.html -->
<!-- ENDIF -->
<!-- INCLUDE ucp_footer.html -->

8
phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
View File

@ -5,6 +5,14 @@
<span class="corners-bottom"><span></span></span></div>
</div>
<!-- IF S_DISPLAY_HISTORY -->
<fieldset class="display-options">
<a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box left">{L_VIEW_PREVIOUS_HISTORY}</a>
<a href="{U_VIEW_NEXT_HISTORY}" class="right-box right">{L_VIEW_NEXT_HISTORY}</a>
</fieldset>
<!-- ENDIF -->
<div id="post-{MESSAGE_ID}" class="post pm<!-- IF S_POST_UNAPPROVED or S_POST_REPORTED --> reported<!-- ENDIF --><!-- IF S_ONLINE --> online<!-- ENDIF -->">
<div class="inner"><span class="corners-top"><span></span></span>

4
phpBB/styles/prosilver/template/ucp_register.html
View File

@ -35,11 +35,11 @@
</dl>
<dl>
<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
<dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="255" value="{EMAIL}" class="inputbox" title="{L_EMAIL_ADDRESS}" /></dd>
<dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="255" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
</dl>
<dl>
<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt>
<dd><input type="text" tabindex="3" name="email_confirm" id="email_confirm" size="25" maxlength="255" value="{EMAIL_CONFIRM}" class="inputbox" title="{L_CONFIRM_EMAIL}" /></dd>
<dd><input type="text" tabindex="3" name="email_confirm" id="email_confirm" size="25" maxlength="255" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd>
</dl>
<dl>
<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>

2
phpBB/styles/prosilver/template/viewforum_body.html
View File

@ -183,7 +183,7 @@
<!-- IF .topicrow and not S_DISPLAY_ACTIVE -->
<div class="topic-actions">
<!-- IF S_IS_POSTABLE -->
<!-- IF S_IS_POSTABLE and not S_IS_BOT -->
<div class="buttons">
<div class="post-icon"><a href="{U_POST_NEW_TOPIC}"><span>{L_POST_REPLY}</span></a></div>
</div>

6
phpBB/styles/prosilver/template/viewtopic_body.html
View File

@ -32,7 +32,7 @@
<div class="buttons">
<!-- IF not S_IS_BOT -->
<!-- IF U_POST_REPLY_TOPIC or S_IS_POSTABLE --><div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}"><span><!-- IF S_IS_LOCKED -->{L_VIEW_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></span></a></div><!-- ENDIF -->
<!-- IF U_POST_REPLY_TOPIC or S_IS_POSTABLE --><div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}"><span><!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></span></a></div><!-- ENDIF -->
<!-- ENDIF -->
</div>
@ -51,7 +51,7 @@
<!-- IF PAGINATION or TOTAL_POSTS -->
<div class="pagination">
<!-- IF U_VIEW_UNREAD_POST --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->{TOTAL_POSTS}
<!-- IF U_VIEW_UNREAD_POST and not S_IS_BOT --><a href="{U_VIEW_UNREAD_POST}">{L_VIEW_UNREAD_POST}</a> &bull; <!-- ENDIF -->{TOTAL_POSTS}
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</div>
<!-- ENDIF -->
@ -234,7 +234,7 @@
<div class="topic-actions">
<div class="buttons">
<!-- IF not S_IS_BOT -->
<!-- IF U_POST_REPLY_TOPIC or S_IS_POSTABLE --><div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}"><span><!-- IF S_IS_LOCKED -->{L_VIEW_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></span></a></div><!-- ENDIF -->
<!-- IF U_POST_REPLY_TOPIC or S_IS_POSTABLE --><div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}"><span><!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF --></span></a></div><!-- ENDIF -->
<!-- ENDIF -->
</div>

2
phpBB/styles/prosilver/theme/colours.css
View File

@ -822,7 +822,7 @@ dl.mini dt {
}
.pmlist li.pm_marked_colour, .pm_marked_colour {
border-left-color: #FF6600;
border-color: #FF6600;
}
.pmlist li.pm_replied_colour, .pm_replied_colour {

2
phpBB/styles/subsilver2/template/mcp_queue.html
View File

@ -27,7 +27,7 @@
</tr>
<!-- BEGINELSE -->
<tr>
<td class="row1" colspan="4" height="30" align="center" valign="middle"><span class="gen">{L_NO_POSTS}</span></td>
<td class="row1" colspan="4" height="30" align="center" valign="middle"><span class="gen"><!-- IF S_TOPICS -->{L_NO_TOPICS_QUEUE}<!-- ELSE -->{L_NO_POSTS}<!-- ENDIF --></span></td>
</tr>
<!-- END postrow -->
<tr>

7
phpBB/viewtopic.php
View File

@ -531,6 +531,12 @@ $template->assign_vars(array(
'FORUM_DESC' => generate_text_for_display($topic_data['forum_desc'], $topic_data['forum_desc_uid'], $topic_data['forum_desc_bitfield'], $topic_data['forum_desc_options']),
'TOPIC_ID' => $topic_id,
'TOPIC_TITLE' => $topic_data['topic_title'],
'TOPIC_POSTER' => $topic_data['topic_poster'],
'TOPIC_AUTHOR_FULL' => get_username_string('full', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']),
'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']),
'TOPIC_AUTHOR' => get_username_string('username', $topic_data['topic_poster'], $topic_data['topic_first_poster_name'], $topic_data['topic_first_poster_colour']),
'PAGINATION' => $pagination,
'PAGE_NUMBER' => on_page($total_posts, $config['posts_per_page'], $start),
'TOTAL_POSTS' => ($total_posts == 1) ? $user->lang['VIEW_TOPIC_POST'] : sprintf($user->lang['VIEW_TOPIC_POSTS'], $total_posts),
@ -1425,6 +1431,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
'U_WARN' => ($auth->acl_getf_global('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&amp;mode=warn_post&amp;f=' . $forum_id . '&amp;p=' . $row['post_id'], true, $user->session_id) : '',
'POST_ID' => $row['post_id'],
'POSTER_ID' => $poster_id,
'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? true : false,
'S_POST_UNAPPROVED' => ($row['post_approved']) ? false : true,