1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 06:51:33 +02:00

To all people having their bug status set to fixed: SF pserver CVS access is currently down, therefore the snapshots are still out of date.

- fix a bunch of bugs
- <!-- $Id$ --> is no longer allowed in template (.html) files
- changed layout of private message screens (folders are menu items)
- removed unread mode for private messages
- added new feature to template engine - "jump out of loop" or "loop another loop within my loop" :D (will be documented within the coding guidelines)
- added autologin field to sessions
- check session length checks
- added add_log statement to sessions to track session valid to invalid changes if ip/browser change depending on config settings (only debug)
- added multibyte support for various variables (exception at the moment is usernames which needs some discussion)
- hopefully not broke something. :/


git-svn-id: file:///svn/phpbb/trunk@5765 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-04-06 17:15:45 +00:00
parent 3933f0bab3
commit 431e494ae4
133 changed files with 613 additions and 661 deletions

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<div id="pagecontent">
<form name="confirm" action="{S_CONFIRM_ACTION}" method="post"><table class="tablebg" width="100%" cellspacing="1">

View File

@@ -1,6 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<a name="top"></a>
<div id="pagecontent">

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<!-- IF U_MCP -->
<div id="pageheader">
<p class="linkmcp">[ <a href="{U_MCP}">{L_MCP}</a> ]</p>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<form action="{S_LOGIN_ACTION}" method="post">
<table class="tablebg" width="100%" cellspacing="1">

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<div id="pagecontent">
<form name="login" method="post" action="{S_LOGIN_ACTION}"><table class="tablebg" width="100%" cellspacing="1" align="center">

View File

@@ -1,5 +1,4 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<div id="pagecontent">

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE mcp_header.html -->
<!-- $Id$ -->
<script type="text/javascript">
<!--

View File

@@ -1,6 +1,4 @@
<!-- $Id$ -->
</td>
</tr>
</table>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE mcp_header.html -->
<!-- $Id$ -->
<!-- IF U_VIEW_FORUM_LOGS --><a href="{U_VIEW_FORUM_LOGS}">{L_VIEW_FORUM_LOGS}</a><!-- ENDIF -->
<form method="post" name="mcp" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1">

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE mcp_header.html -->
<!-- $Id$ -->
<!-- IF S_SHOW_UNAPPROVED -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<script language="javascript" type="text/javascript" defer="defer">
<!--
function marklist(form_name, status)

View File

@@ -1,5 +1,3 @@
<!-- $Id$ -->
<!-- Note: no longer in use... -->
<form name="jumpbox" method="post" action="{S_JUMPBOX_ACTION}">

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE mcp_header.html -->
<!-- $Id$ -->
<form method="post" name="mcp" action="{U_POST_ACTION}">
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<div id="pagecontent">
<form name="confirm" action="{S_CONFIRM_ACTION}" method="post"><table class="tablebg" width="100%" cellspacing="1">

View File

@@ -1,6 +1,5 @@
<!-- INCLUDE mcp_header.html -->
<!-- $Id$ -->
<form method="post" name="mcp" action="{U_POST_ACTION}">
<table class="bg" width="75%" cellspacing="1" cellpadding="4" border="0" align="center">
<tr>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE mcp_header.html -->
<!-- $Id$ -->
<form method="post" name="mcp" action="{U_POST_ACTION}">
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE mcp_header.html -->
<!-- $Id$ -->
<!-- IF S_MCP_REPORT -->
<form method="post" name="mcp_report" action="{U_CLOSE_ACTION}"><table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
<tr>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE mcp_header.html -->
<!-- $Id$ -->
<form name="mcp" method="post" action="{S_MCP_ACTION}"><table class="tablebg" width="100%" cellspacing="1">
<!-- IF S_CAN_SPLIT -->
<tr>

View File

@@ -1,4 +1,3 @@
<!-- $Id$ -->
<!-- INCLUDE mcp_header.html -->
<table class="tablebg" width="100%" cellspacing="1" cellpadding="2" border="0">

View File

@@ -1,6 +1,5 @@
<!-- INCLUDE mcp_header.html -->
<!-- $Id$ -->
<form method="post" name="mcp" action="{U_POST_ACTION}">
<table class="bg" width="75%" cellspacing="1" cellpadding="4" border="0" align="center">
<tr>

View File

@@ -1,6 +1,5 @@
<!-- INCLUDE mcp_header.html -->
<!-- $Id$ -->
<form method="post" name="mcp" action="{U_POST_ACTION}">
<table class="tablebg" width="100%" cellspacing="1">

View File

@@ -1,6 +1,5 @@
<!-- INCLUDE mcp_header.html -->
<!-- $Id$ -->
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
<tr>
<th colspan="2" height="28" align="center">{L_POST}</th>

View File

@@ -1,6 +1,5 @@
<!-- INCLUDE mcp_header.html -->
<!-- $Id$ -->
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
<tr>
<th colspan="2" height="28" align="center">{USERNAME}</th>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<!-- IF S_SEARCH_USER --><!-- INCLUDE memberlist_search.html --><!-- ENDIF -->
<!-- IF S_SHOW_GROUP --><!-- INCLUDE memberlist_group.html --><!-- ENDIF -->

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<script language="JavaScript" type="text/javascript">
<!--

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<form method="post" action="{S_MODE_ACTION}">
<table class="tablebg" width="100%" cellspacing="1">

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<div id="pagecontent">
<form method="post" action="{S_PROFILE_ACTION}"><table class="tablebg" width="100%" cellspacing="1">

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th>{MESSAGE_TITLE}</th>

View File

@@ -9,12 +9,12 @@
"phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
forums may be affected.
The phpBB Group : 2003
The phpBB Group : 2006
// -->
<div id="wrapfooter">
<!-- 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/">phpBB</a> &copy; 2002, 2006 phpBB Group<br />
<span class="copyright">Powered by <a href="http://www.phpbb.com/" target="_blank">phpBB</a> &copy; 2002, 2006 phpBB Group<br />
{TRANSLATION_INFO}<!-- IF DEBUG_OUTPUT --><br />[ {DEBUG_OUTPUT} ]<!-- ENDIF --></span>
</div>

View File

@@ -14,14 +14,6 @@
{META}
<title>{SITENAME} &bull; {PAGE_TITLE}</title>
<!--
phpBB style name: subsilver
Based on style: subsilver (the default phpBB 2 style)
Original author: subBlue ( http://www.subBlue.com/ )
Modified by: psoTFX ( http://www.phpbb.com )
Last update: $Id$
-->
<!-- IF T_STYLESHEET_LINK -->
<link rel="stylesheet" href="{T_STYLESHEET_LINK}" type="text/css" />
<!-- ELSE -->

View File

@@ -1,5 +1,3 @@
<!-- $Id$ -->
<script language="javascript" type="text/javascript">
<!--
function popup_progress_bar()

View File

@@ -4,8 +4,6 @@
<!-- INCLUDE overall_header.html -->
<!-- ENDIF -->
<!-- $Id$ -->
<script language="javascript" type="text/javascript">
<!--

View File

@@ -1,4 +1,3 @@
<!-- $Id$ -->
<tr>
<th colspan="2" height="28">{L_ADD_POLL}</th>

View File

@@ -1,5 +1,4 @@
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th>{L_PREVIEW}</th>

View File

@@ -1,5 +1,3 @@
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th align="center">{L_POST_REVIEW}</th>

View File

@@ -1,5 +1,3 @@
<!-- $Id$ -->
<!-- INCLUDE simple_header.html -->
<script language="javascript" type="text/javascript">

View File

@@ -1,4 +1,3 @@
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<form method="post" id="report" action="{S_REPORT_ACTION}">
<table class="tablebg" width="100%" cellspacing="1">

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<div id="pagecontent">
<form method="get" action="{S_SEARCH_ACTION}"><table class="tablebg" width="100%" cellspacing="1">

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<form method="post" action="{S_SEARCH_ACTION}">
<table width="100%" cellspacing="1">

View File

@@ -13,7 +13,7 @@
// -->
<div id="wrapfooter">
<span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; 2002, 2006 phpBB Group</span>
<span class="copyright">Powered by <a href="http://www.phpbb.com/" target="_blank">phpBB</a> &copy; 2002, 2006 phpBB Group</span>
</div>
</body>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<!-- IF S_SHOW_COPPA or S_REGISTRATION -->
<form method="post" action="{S_UCP_ACTION}">

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<!-- IF S_ATTACHMENT_ROWS -->
<table class="tablebg" width="100%" cellspacing="1">

View File

@@ -1,5 +1,5 @@
</form></td>
<!-- IF not S_PRIVMSGS --></form><!-- ENDIF --></td>
</tr>
</table>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<!-- IF S_EDIT -->
<script type="text/javascript">

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th colspan="3">{L_USERGROUPS}</th>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td width="20%" valign="top">
@@ -51,12 +49,34 @@
<tr>
<th>{L_OPTIONS}</th>
</tr>
<!-- BEGIN l_block1 -->
<tr>
<!-- IF l_block1.S_SELECTED -->
<td class="row1"><b class="nav">{l_block1.L_TITLE}</b>
<!-- IF S_PRIVMSGS -->
<!-- the ! at the beginning of the loop name forces the loop to be not a nested one of l_block1 (it gets parsed seperatly) -->
<!-- BEGIN !folder -->
<!-- IF folder.S_FIRST_ROW -->
<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
<!-- ENDIF -->
<!-- IF folder.S_CUR_FOLDER -->
<li class="row2" style="padding: 1px 0;">&#187; <a href="{folder.U_FOLDER}">{folder.FOLDER_NAME}<!-- IF folder.S_UNREAD_MESSAGES --> ({folder.UNREAD_MESSAGES})<!-- ENDIF --></a></li>
<!-- ELSE -->
<li>&#187; <a href="{folder.U_FOLDER}">{folder.FOLDER_NAME}<!-- IF folder.S_UNREAD_MESSAGES --> ({folder.UNREAD_MESSAGES})<!-- ENDIF --></a></li>
<!-- ENDIF -->
<!-- IF folder.S_LAST_ROW -->
</ul>
<hr />
<!-- ENDIF -->
<!-- END !folder -->
<!-- ENDIF -->
<ul class="nav" style="margin: 0px; padding: 0px; list-style-type: none; line-height: 175%;">
<!-- BEGIN l_block2 -->
<li>&#187; <!-- IF l_block1.l_block2.S_SELECTED --><b>{l_block1.l_block2.L_TITLE}</b><!-- ELSE --><a href="{l_block1.l_block2.U_TITLE}">{l_block1.l_block2.L_TITLE}</a><!-- ENDIF --></li>
@@ -68,8 +88,7 @@
</td>
</tr>
<!-- END l_block1 -->
</table>
</table>
<div style="padding: 2px;"></div>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th colspan="5">{L_UCP}</th>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th colspan="4">{L_UCP}</th>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th colspan="3">{L_UCP}</th>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th colspan="4">{L_UCP}</th>

View File

@@ -1,67 +1,68 @@
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th align="center">{L_MESSAGE_HISTORY} - {TITLE}</th>
</tr>
<tr>
<td class="row1"><div style="overflow: auto; width: 100%; height: 300px;">
<tr>
<th align="center">{L_MESSAGE_HISTORY} - {TITLE}</th>
</tr>
<tr>
<td class="row1"><div style="overflow: auto; width: 100%; height: 300px;">
<table class="tablebg" width="100%" cellspacing="1">
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th width="22%">{L_AUTHOR}</th>
<th>{L_MESSAGE}</th>
</tr>
<!-- BEGIN history_row -->
<!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td rowspan="2" align="left" valign="top"><a name="{history_row.U_POST_ID}"></a>
<table width="150" cellspacing="0">
<tr>
<th width="22%">{L_AUTHOR}</th>
<th>{L_MESSAGE}</th>
<td align="center" colspan="2"><b class="postauthor">{history_row.AUTHOR_NAME}</b></td>
</tr>
<!-- BEGIN history_row -->
</table>
</td>
<td width="100%"<!-- IF history_row.S_CURRENT_MSG --> style="background-color:lightblue"<!-- ENDIF -->>
<div class="gensmall" style="float:left"><b>{L_PM_SUBJECT}:</b>&nbsp;{history_row.SUBJECT}</div><div class="gensmall" style="float:right"><b>{L_FOLDER}:</b>&nbsp;{history_row.FOLDER}</div>
</td>
</tr>
<!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td rowspan="2" align="left" valign="top"><a name="{history_row.U_POST_ID}"></a>
<table width="150" cellspacing="0">
<tr>
<td align="center" colspan="2"><b class="postauthor">{history_row.AUTHOR_NAME}</b></td>
</tr>
<!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td valign="top">
<table width="100%" cellspacing="0">
<tr>
<td valign="top">
<table width="100%" cellspacing="0" cellpadding="2">
<tr>
<td><div id="message_{history_row.U_POST_ID}"><div class="postbody">{history_row.MESSAGE}</div></div></td>
</tr>
</table>
</td>
<td width="100%"<!-- IF history_row.S_CURRENT_MSG --> style="background-color:lightblue"<!-- ENDIF -->>
<div class="gensmall" style="float:left"><b>{L_PM_SUBJECT}:</b>&nbsp;{history_row.SUBJECT}</div><div class="gensmall" style="float:right"><b>{L_FOLDER}:</b>&nbsp;{history_row.FOLDER}</div>
</tr>
<tr>
<td>
<table width="100%" cellspacing="0">
<tr valign="middle">
<td width="100%">&nbsp;</td>
<td width="10" nowrap="nowrap">{history_row.MINI_POST_IMG}</td>
<td class="gensmall" nowrap="nowrap"><b>{L_SENT_AT}:</b> {history_row.SENT_DATE}</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
<!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td valign="top"><table width="100%" cellspacing="0">
<tr>
<td valign="top"><table width="100%" cellspacing="0" cellpadding="2">
<tr>
<td><div id="message_{history_row.U_POST_ID}"><div class="postbody">{history_row.MESSAGE}</div></div></td>
</tr>
</table></td>
</tr>
<tr>
<td><table width="100%" cellspacing="0">
<tr valign="middle">
<td width="100%">&nbsp;</td>
<td width="10" nowrap="nowrap">{history_row.MINI_POST_IMG}</td>
<td class="gensmall" nowrap="nowrap"><b>{L_SENT_AT}:</b> {history_row.SENT_DATE}</td>
</tr>
</table></td>
</tr>
</table></td>
</tr>
<!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td class="gensmall"><a href="{history_row.U_VIEW_MESSAGE}">{L_VIEW_PM}</a></td>
<td><div class="gensmall" style="float:left">&nbsp;<!-- IF history_row.U_PROFILE --><a href="{history_row.U_PROFILE}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF history_row.U_EMAIL --><a href="{history_row.U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float:right"><!-- IF history_row.U_QUOTE --><a href="{history_row.U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF history_row.U_POST_REPLY_PM --><a href="{history_row.U_POST_REPLY_PM}">{REPLY_IMG}</a><!-- ENDIF -->&nbsp;</div></td>
</tr>
<tr>
<td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
</tr>
<!-- END history_row -->
</table>
</div></td>
</tr>
<!-- IF history_row.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td class="gensmall"><a href="{history_row.U_VIEW_MESSAGE}">{L_VIEW_PM}</a></td>
<td><div class="gensmall" style="float:left">&nbsp;<!-- IF history_row.U_PROFILE --><a href="{history_row.U_PROFILE}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF history_row.U_EMAIL --><a href="{history_row.U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float:right"><!-- IF history_row.U_QUOTE --><a href="{history_row.U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF history_row.U_POST_REPLY_PM --><a href="{history_row.U_POST_REPLY_PM}">{REPLY_IMG}</a><!-- ENDIF -->&nbsp;</div></td>
</tr>
<tr>
<td class="spacer" colspan="2"><img src="images/spacer.gif" alt="" width="1" height="1" /></td>
</tr>
<!-- END history_row -->
</table>
</div></td>
</tr>
</table>
<br clear="all" />

View File

@@ -1,39 +1,41 @@
<!-- $Id$ -->
</form>
<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
<tr>
<td class="row1"><table border="0" cellspacing="0" cellpadding="0" width="100%"><tr><td align="left">
<!-- IF TOTAL_MESSAGES -->
<table width="100%" cellspacing="1">
<tr>
<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_MESSAGES} ]&nbsp;</td>
<td class="gensmall" width="100%" align="right" nowrap="nowrap"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></td>
</tr>
</table>
<!-- ENDIF -->
<!-- IF S_VIEW_MESSAGE -->
<span class="gensmall">
<!-- IF U_PRINT_PM --><a href="{U_PRINT_PM}" title="{L_PRINT_PM}">{L_PRINT_PM}</a><!-- IF U_EMAIL_PM or U_FORWARD_PM--> | <!-- ENDIF --><!-- ENDIF -->
<!-- IF U_EMAIL_PM --><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}">{L_EMAIL_PM}</a><!-- IF U_FORWARD_PM --> | <!-- ENDIF --><!-- ENDIF -->
<!-- IF U_FORWARD_PM --><a href="{U_FORWARD_PM}" title="{L_FORWARD_PM}">{L_FORWARD_PM}</a><!-- ENDIF -->
</span>
<!-- ENDIF -->
</td>
<td align="right" nowrap="nowrap">
<!-- IF S_VIEW_MESSAGE -->
<form name="movepm" method="post" action="{S_PM_ACTION}" style="margin:0px">
<input type="hidden" name="marked_msg_id[]" value="{MSG_ID}" />
<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
<input type="hidden" name="p" value="{MSG_ID}" />
<!-- ENDIF -->
<!-- IF not S_UNREAD -->
<select name="dest_folder">{S_TO_FOLDER_OPTIONS}</select>&nbsp;<input class="btnlite" type="submit" name="move_pm" value="<!-- IF S_VIEW_MESSAGE -->Place Message into Folder<!-- ELSE -->Place Marked into Folder<!-- ENDIF -->" />
<!-- ENDIF -->
</form>
</td></tr></table></td>
</tr>
<tr>
<td class="row1">
<table border="0" cellspacing="0" cellpadding="0" width="100%">
<tr>
<td align="left">
<!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF -->
<!-- IF S_VIEW_MESSAGE -->
<span class="gensmall">
<!-- IF U_PRINT_PM --><a href="{U_PRINT_PM}" title="{L_PRINT_PM}">{L_PRINT_PM}</a><!-- IF U_EMAIL_PM or U_FORWARD_PM--> | <!-- ENDIF --><!-- ENDIF -->
<!-- IF U_EMAIL_PM --><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}">{L_EMAIL_PM}</a><!-- IF U_FORWARD_PM --> | <!-- ENDIF --><!-- ENDIF -->
<!-- IF U_FORWARD_PM --><a href="{U_FORWARD_PM}" title="{L_FORWARD_PM}">{L_FORWARD_PM}</a><!-- ENDIF -->
</span>
<!-- ENDIF -->
</td>
<td align="right" nowrap="nowrap">
<!-- IF S_VIEW_MESSAGE -->
<form name="movepm" method="post" action="{S_PM_ACTION}" style="margin:0px">
<input type="hidden" name="marked_msg_id[]" value="{MSG_ID}" />
<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
<input type="hidden" name="p" value="{MSG_ID}" />
<select name="dest_folder">{S_TO_FOLDER_OPTIONS}</select>&nbsp;<input class="btnlite" type="submit" name="move_pm" value="<!-- IF S_VIEW_MESSAGE -->Place Message into Folder<!-- ELSE -->Place Marked into Folder<!-- ENDIF -->" />
</form>
<!-- ELSE -->
<form name="sortmsg" method="post" action="{S_PM_ACTION}" style="margin:0px">
<span class="gensmall">{L_DISPLAY_MESSAGES}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" />
</form>
<!-- ENDIF -->
</td>
</tr>
</table>
</td>
</tr>
</table>
<!-- IF not S_VIEW_MESSAGE --><div style="float:right"><b class="gensmall"><a href="javascript:marklist('viewfolder', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('viewfolder', false);">{L_UNMARK_ALL}</a></b></div><!-- ENDIF -->
<!-- IF not S_VIEW_MESSAGE -->
<div style="float:right"><b class="gensmall"><a href="javascript:marklist('viewfolder', true);">{L_MARK_ALL}</a> :: <a href="javascript:marklist('viewfolder', false);">{L_UNMARK_ALL}</a></b></div>
<!-- ENDIF -->

View File

@@ -1,6 +1,4 @@
<!-- $Id$ -->
<script language="javascript" type="text/javascript">
<!--
function marklist(form_name, status)
@@ -13,34 +11,32 @@ function marklist(form_name, status)
//-->
</script>
<table width="100%" cellspacing="1">
<tr>
<td class="gensmall" nowrap="nowrap" align="left">
<!-- IF S_UNREAD --><b>{L_UNREAD_MESSAGES}</b><!-- ELSE -->{FOLDER_STATUS}<!-- ENDIF -->
<td class="gensmall" nowrap="nowrap" align="right"><!-- IF not S_IN_INBOX --><a href="{U_INBOX}">{L_PM_INBOX}</a><!-- ELSE --><b>{L_PM_INBOX}</b><!-- ENDIF -->&nbsp;|&nbsp;<!-- IF not S_IN_OUTBOX --><a href="{U_OUTBOX}">{L_PM_OUTBOX}</a><!-- ELSE --><b>{L_PM_OUTBOX}</b><!-- ENDIF -->&nbsp;|&nbsp;<!-- IF not S_IN_SENTBOX --><a href="{U_SENTBOX}">{L_PM_SENTBOX}</a><!-- ELSE --><b>{L_PM_SENTBOX}</b><!-- ENDIF -->&nbsp;|&nbsp;<a href="{U_CREATE_FOLDER}">{L_CREATE_FOLDER}</a></td>
</tr>
</table>
<table class="tablebg" width="100%" cellspacing="1" cellpadding="0">
<tr>
<td class="row1"><table border="0" cellspacing="0" cellpadding="0" width="100%"><tr><td align="left">
<!-- IF TOTAL_MESSAGES -->
<table width="100%" cellspacing="1">
<tr>
<td class="row1">
<table border="0" cellspacing="0" cellpadding="0" width="100%">
<tr>
<td align="left">
<!-- IF TOTAL_MESSAGES -->
<table width="100%" cellspacing="1">
<tr>
<td class="nav" valign="middle" nowrap="nowrap">&nbsp;{PAGE_NUMBER}<br /></td>
<td class="gensmall" nowrap="nowrap">&nbsp;[ {TOTAL_MESSAGES} ]&nbsp;</td>
<td class="gensmall" width="100%" align="right" nowrap="nowrap"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></td>
<td class="gensmall" nowrap="nowrap" width="100%">&nbsp;[ <b>{FOLDER_CUR_MESSAGES}</b>/{FOLDER_MAX_MESSAGES} {L_MESSAGES} ({FOLDER_PERCENT}%) ]&nbsp;</td>
</tr>
</table>
<!-- ENDIF -->
<!-- IF S_VIEW_MESSAGE -->
<span class="gensmall">
<!-- IF S_DISPLAY_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}">{L_VIEW_PREVIOUS_HISTORY}</a> | <a href="{U_VIEW_NEXT_HISTORY}">{L_VIEW_NEXT_HISTORY}</a> | <!-- ENDIF --><a href="{U_PREVIOUS_PM}">{L_VIEW_PREVIOUS_PM}</a> | <a href="{U_NEXT_PM}">{L_VIEW_NEXT_PM}</a>&nbsp;
</span>
<!-- ENDIF -->
</td><td align="right" nowrap="nowrap"><form name="choosefolder" method="post" action="{S_FOLDER_ACTION}" style="margin:0px">
<select name="f">{S_FOLDER_OPTIONS}</select>&nbsp;<input class="btnlite" type="submit" name="folder" value="{L_GO}" /></form>
</td></tr></table></td>
</tr>
</table>
<!-- ENDIF -->
<!-- IF S_VIEW_MESSAGE -->
<span class="gensmall">
<!-- IF S_DISPLAY_HISTORY -->
<a href="{U_VIEW_PREVIOUS_HISTORY}">{L_VIEW_PREVIOUS_HISTORY}</a> | <a href="{U_VIEW_NEXT_HISTORY}">{L_VIEW_NEXT_HISTORY}</a> |
<!-- ENDIF --><a href="{U_PREVIOUS_PM}">{L_VIEW_PREVIOUS_PM}</a> | <a href="{U_NEXT_PM}">{L_VIEW_NEXT_PM}</a>&nbsp;
</span>
<!-- ENDIF -->
</td>
<td align="right"><!-- IF PAGINATION --><b><a href="javascript:jumpto();">{L_GOTO_PAGE}</a> <!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}">{L_PREVIOUS}</a>&nbsp;&nbsp;<!-- ENDIF -->{PAGINATION}<!-- IF NEXT_PAGE -->&nbsp;&nbsp;<a href="{NEXT_PAGE}">{L_NEXT}</a><!-- ENDIF --></b><!-- ENDIF --></td>
</tr>
</table>
</td>
</tr>
</table>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<!-- IF ERROR_MESSAGE or NOTIFICATION_MESSAGE -->
<table border="0" cellspacing="0" cellpadding="0" width="100%">
<tr>

View File

@@ -1,24 +1,21 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<div id="pagecontent">
<!-- IF not PROMPT -->
<!-- INCLUDE ucp_pm_message_header.html -->
<!-- INCLUDE ucp_pm_message_header.html -->
<!-- ENDIF -->
<div style="padding: 2px;"></div>
<!-- IF S_PM_ICONS and S_UNREAD -->
<!-- DEFINE $COLSPAN = 7 -->
<!-- ELSEIF not S_PM_ICONS and not S_UNREAD -->
<!-- DEFINE $COLSPAN = 5 -->
<!-- ELSE -->
<!-- IF S_PM_ICONS -->
<!-- DEFINE $COLSPAN = 6 -->
<!-- ELSE -->
<!-- DEFINE $COLSPAN = 5 -->
<!-- ENDIF -->
<form name="viewfolder" method="post" action="{S_PM_ACTION}" style="margin:0px">
<!-- IF PROMPT -->
<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" border="0">
<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" border="0">
<tr>
<th colspan="2" valign="middle">{L_OPTIONS}</th>
</tr>
@@ -33,22 +30,20 @@
<tr>
<td class="cat" colspan="2" align="center"><input type="hidden" name="export_option" value="CSV" /><input class="btnmain" type="submit" name="submit_export" value="{L_EXPORT_FOLDER}" />&nbsp;&nbsp;<input class="btnlite" type="reset" value="Reset" name="reset" /></td>
</tr>
</table>
</table>
</form>
<!-- ELSE -->
<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" border="0">
<!-- IF NUM_NOT_MOVED -->
<tr>
<td class="row3" colspan="{$COLSPAN}" align="center"><span class="gen">{NOT_MOVED_MESSAGES}<br />{RELEASE_MESSAGE_INFO}</span></td>
</tr>
<!-- ENDIF -->
<table class="tablebg" width="100%" cellspacing="1" cellpadding="0" border="0">
<!-- IF NUM_NOT_MOVED -->
<tr>
<td class="row3" colspan="{$COLSPAN}" align="center"><span class="gen">{NOT_MOVED_MESSAGES}<br />{RELEASE_MESSAGE_INFO}</span></td>
</tr>
<!-- ENDIF -->
<tr>
<th colspan="<!-- IF S_PM_ICONS -->3<!-- ELSE -->2<!-- ENDIF -->">&nbsp;{L_SUBJECT}&nbsp;</th>
<!-- IF S_UNREAD -->
<th>&nbsp;<!-- IF S_SHOW_RECIPIENTS -->{L_RECIPIENTS}<!-- ELSE -->{L_AUTHOR}<!-- ENDIF -->&nbsp;</th>
<th>&nbsp;{L_FOLDER}&nbsp;</th>
<!-- ELSE -->
<th>&nbsp;<!-- IF S_SHOW_RECIPIENTS -->{L_RECIPIENTS}<!-- ELSE -->{L_AUTHOR}<!-- ENDIF -->&nbsp;</th>
<!-- ENDIF -->
<th>&nbsp;<!-- IF S_SHOW_RECIPIENTS -->{L_RECIPIENTS}<!-- ELSE -->{L_AUTHOR}<!-- ENDIF -->&nbsp;</th>
<th>&nbsp;{L_SENT_AT}&nbsp;</th>
<th>&nbsp;{L_MARK}&nbsp;</th>
</tr>
@@ -61,11 +56,11 @@
<!-- ENDIF -->
<!-- IF messagerow.S_PM_DELETED --><td class="row3"><!-- ELSE --><td class="row1"><!-- ENDIF -->
<!-- IF not messagerow.PM_IMG and messagerow.PM_CLASS -->
<span class="{messagerow.PM_CLASS}"><img src="images/spacer.gif" width="10" height="10" alt="" border="0" /></span>&nbsp;
<span class="{messagerow.PM_CLASS}" style="float: left;"><img src="images/spacer.gif" width="10" height="10" alt="" /></span>&nbsp;
<!-- ELSEIF messagerow.PM_IMG -->
{messagerow.PM_IMG}&nbsp;
<!-- ENDIF -->
<p class="topictitle">
<span class="topictitle">
{messagerow.ATTACH_ICON_IMG}
<!-- IF messagerow.S_PM_DELETED -->
{L_MESSAGE_REMOVED_FROM_OUTBOX}<br />
@@ -73,11 +68,8 @@
<!-- ELSE -->
<a href="{messagerow.U_VIEW_PM}">{messagerow.SUBJECT}</a>
<!-- ENDIF -->
</p></td>
</span></td>
<td class="row1" width="100" align="center"><p class="topicauthor"><!-- IF S_SHOW_RECIPIENTS -->{messagerow.RECIPIENTS}<!-- ELSE -->{messagerow.MESSAGE_AUTHOR}<!-- ENDIF --></p></td>
<!-- IF S_UNREAD -->
<td class="row1" width="100" align="center"><p class="topicauthor"><!-- IF messagerow.FOLDER --><a href="{messagerow.U_FOLDER}">{messagerow.FOLDER}</a><!-- ELSE -->{L_UNKNOWN_FOLDER}<!-- ENDIF --></p></td>
<!-- ENDIF -->
<td class="row1" width="120" align="center"><p class="topicdetails">{messagerow.SENT_TIME}</p></td>
<td class="row1" width="20" align="center"><p class="topicdetails"><input type="checkbox" name="marked_msg_id[]" value="{messagerow.MESSAGE_ID}" /></p></td>
</tr>
@@ -86,25 +78,26 @@
<td class="row1" colspan="{$COLSPAN}" height="30" align="center" valign="middle"><span class="gen">{L_NO_MESSAGES}</span></td>
</tr>
<!-- END messagerow -->
<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
</table>
<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
<table border="0" cellspacing="0" cellpadding="0" width="100%">
<tr>
<td class="cat" align="left"><span class="gensmall">{L_DISPLAY_MESSAGES}:</span> {S_SELECT_SORT_DAYS} <span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} <input class="btnlite" type="submit" name="sort" value="{L_GO}" /></td>
<td class="cat" align="right"><select name="mark_option">{S_MARK_OPTIONS}</select>&nbsp;<input class="btnlite" type="submit" name="submit_mark" value="{L_GO}" />&nbsp;</td>
</tr>
<tr>
<td class="cat">
<!-- IF .messagerow -->
<div style="float: left;"><select name="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>&nbsp;<input class="btnlite" type="submit" name="submit_export" value="{L_EXPORT_FOLDER}" /></div>
<div style="float: right;"><select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select>&nbsp;<input class="btnlite" type="submit" name="submit_mark" value="{L_GO}" />&nbsp;</div>
<!-- ENDIF -->
</td>
</tr>
</table>
<div style="padding: 2px;"></div>
<!-- INCLUDE ucp_pm_message_footer.html -->
<!-- IF .messagerow -->
<div style="float:left"><br /><select name="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>&nbsp;<input class="btnlite" type="submit" name="submit_export" value="{L_EXPORT_FOLDER}" /></div>
<!-- ENDIF -->
<!-- ENDIF -->
</form>
<br clear="all" />
</div>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<div id="pagecontent">
<!-- INCLUDE ucp_pm_message_header.html -->

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<script type="text/javascript">
<!--
// Set display of page element

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th colspan="2" valign="middle">{L_TITLE}</th>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th colspan="2" valign="middle">{L_TITLE}</th>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th colspan="2" valign="middle">{L_TITLE}</th>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th colspan="2" valign="middle">{L_TITLE}</th>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th colspan="2" valign="middle">{L_TITLE}</th>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<script language="javascript" type="text/javascript">
<!--

View File

@@ -1,6 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<script language="Javascript" type="text/javascript">
<!--
function change_language(lang_iso)

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th colspan="2" valign="middle">{L_TITLE}</th>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE ucp_header.html -->
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th colspan="2" valign="middle">{L_TITLE}</th>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<!-- IF S_FORUM_RULES -->
<div class="forumrules">
<!-- IF U_FORUM_RULES -->

View File

@@ -1,6 +1,4 @@
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<td class="cat" colspan="5" align="right"><a class="nav" href="{U_MARK_FORUMS}">{L_MARK_FORUMS_READ}</a>&nbsp;</td>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<h4>{TOTAL_REGISTERED_USERS_ONLINE}</h4>
<h4>{TOTAL_GUEST_USERS_ONLINE}<!-- IF S_SWITCH_GUEST_DISPLAY --> [ <a href="{U_SWITCH_GUEST_DISPLAY}">{L_SWITCH_GUEST_DISPLAY}</a> ]<!-- ENDIF --></h4>
<br />

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE simple_header.html -->
<!-- $Id$ -->
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th>{L_WHOIS}</th>

View File

@@ -1,7 +1,5 @@
<!-- INCLUDE overall_header.html -->
<!-- $Id$ -->
<!-- IF S_FORUM_RULES -->
<div class="forumrules">
<!-- IF U_FORUM_RULES -->

View File

@@ -4,7 +4,6 @@
Based on style: subSilver (the default phpBB 2 style)
Original author: subBlue ( http://www.subBlue.com/ )
Modified by: psoTFX and the phpBB team ( http://www.phpbb.com )
Official update: $Id$
This is an alternative style for phpBB3 for those wishing to stay with
the familiar subSilver style of phpBB version 2.x