makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

- tackle some usability issues

Browse source 
- fix bug #3147
- added the lock-images made by SHS`
- fixed MSSQL errors (adding the correct ESCAPE sequence)


git-svn-id: file:///svn/phpbb/trunk@6161 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-07-09 16:23:57 +00:00
parent 455add06f2
commit 46af817cb0
60 changed files with 527 additions and 216 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
phpBB/adm/style/acp_forums.html
View file

@ -123,6 +123,16 @@
<dt><label for="forum_status">{L_FORUM_STATUS}:</label></dt>
<dd><select id="forum_status" name="forum_status">{S_STATUS_OPTIONS}</select></dd>
</dl>
<!-- IF S_SHOW_DISPLAY_ON_INDEX -->
<dl>
<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
<dd><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
</dl>
<!-- ENDIF -->
<dl>
<dt><label for="enable_post_review">{L_ENABLE_POST_REVIEW}:</label><br /><span>{L_ENABLE_POST_REVIEW_EXPLAIN}</span></dt>
<dd><input type="radio" class="radio" name="enable_post_review" value="1"<!-- IF S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_post_review" value="0"<!-- IF not S_ENABLE_POST_REVIEW --> id="enable_post_review" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
</dl>
<dl>
<dt><label for="enable_indexing">{L_ENABLE_INDEXING}:</label><br /><span>{L_ENABLE_INDEXING_EXPLAIN}</span></dt>
<dd><input type="radio" class="radio" name="enable_indexing" value="1"<!-- IF S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_indexing" value="0"<!-- IF not S_ENABLE_INDEXING --> id="enable_indexing" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
@ -131,16 +141,26 @@
<dt><label for="enable_icons">{L_ENABLE_TOPIC_ICONS}:</label></dt>
<dd><input type="radio" class="radio" name="enable_icons" value="1"<!-- IF S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_icons" value="0"<!-- IF not S_TOPIC_ICONS --> id="enable_icons" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
</dl>
<!-- IF S_SHOW_DISPLAY_ON_INDEX -->
<dl>
<dt><label for="display_on_index">{L_LIST_INDEX}:</label><br /><span>{L_LIST_INDEX_EXPLAIN}</span></dt>
<dd><input type="radio" class="radio" name="display_on_index" value="1"<!-- IF S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="display_on_index" value="0"<!-- IF not S_DISPLAY_ON_INDEX --> id="display_on_index" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
</dl>
<!-- ENDIF -->
<dl>
<dt><label for="display_recent">{L_ENABLE_RECENT}:</label><br /><span>{L_ENABLE_RECENT_EXPLAIN}</span></dt>
<dd><input type="radio" class="radio" name="display_recent" value="1"<!-- IF S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="display_recent" value="0"<!-- IF not S_DISPLAY_ACTIVE_TOPICS --> id="display_recent" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
</dl>
<dl>
<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" /></dd>
</dl>
<dl>
<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
<dd><input type="password" id="forum_password" name="forum_password" value="{FORUM_PASSWORD}" /></dd>
</dl>
<dl>
<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="{FORUM_PASSWORD_CONFIRM}" /></dd>
</dl>
</fieldset>
<fieldset>
<legend>{L_FORUM_PRUNE_SETTINGS}</legend>
<dl>
<dt><label for="enable_prune">{L_FORUM_AUTO_PRUNE}:</label><br /><span>{L_FORUM_AUTO_PRUNE_EXPLAIN}</span></dt>
<dd><input type="radio" class="radio" name="enable_prune" value="1"<!-- IF S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="enable_prune" value="0"<!-- IF not S_PRUNE_ENABLE --> id="enable_prune" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
@ -169,18 +189,6 @@
<dt><label for="prune_sticky">{L_PRUNE_STICKY}:</label></dt>
<dd><input type="radio" class="radio" name="prune_sticky" value="1"<!-- IF S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_YES} &nbsp; <input type="radio" class="radio" name="prune_sticky" value="0"<!-- IF not S_PRUNE_STICKY --> id="prune_sticky" checked="checked"<!-- ENDIF --> /> {L_NO}</dd>
</dl>
<dl>
<dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt>
<dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" /></dd>
</dl>
<dl>
<dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt>
<dd><input type="password" id="forum_password" name="forum_password" value="{FORUM_PASSWORD}" /></dd>
</dl>
<dl>
<dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt>
<dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="{FORUM_PASSWORD_CONFIRM}" /></dd>
</dl>
</fieldset>
</div>

22
phpBB/adm/style/acp_groups.html
View file

@ -153,12 +153,16 @@
<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
<h1>{L_GROUP_MEMBERS}</h1>
<h1>{L_GROUP_MEMBERS} :: {GROUP_NAME}</h1>
<p>{L_GROUP_MEMBERS_EXPLAIN}</p>
<form id="list" method="post" action="{U_ACTION}">
<fieldset class="quick">
<a href="{U_DEFAULT_ALL}">&raquo; {L_MAKE_DEFAULT_FOR_ALL}</a>
</fieldset>
<table cellspacing="1">
<thead>
<tr>
@ -269,9 +273,10 @@
<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
<thead>
<tr>
<th style="width: 50%">{L_MANAGE}</th>
<th style="width: 50%">{L_GROUP}</th>
<th>{L_TOTAL_MEMBERS}</th>
<th colspan="3">{L_OPTIONS}</th>
<th colspan="2">{L_OPTIONS}</th>
<th>{L_ACTION}</th>
</tr>
</thead>
<tbody>
@ -297,18 +302,19 @@
<col class="col1" /><col class="col1" /><col class="col2" /><col class="col2" /><col class="col2" />
<thead>
<tr>
<th style="width: 50%">{L_MANAGE}</th>
<th style="width: 50%">{L_GROUP}</th>
<th>{L_TOTAL_MEMBERS}</th>
<th colspan="3">{L_OPTIONS}</th>
<th colspan="2">{L_OPTIONS}</th>
<th>{L_ACTION}</th>
</tr>
</thead>
<tbody>
<!-- ELSE -->
<tr>
<td><a href="{groups.U_LIST}">{groups.GROUP_NAME}</a></td>
<td><strong>{groups.GROUP_NAME}</strong></td>
<td style="text-align: center;">{groups.TOTAL_MEMBERS}</td>
<td style="text-align: center;"><a href="{groups.U_DEFAULT}">{L_GROUP_DEFAULT}</a></td>
<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_EDIT}</a></td>
<td style="text-align: center;"><a href="{groups.U_EDIT}">{L_SETTINGS}</a></td>
<td style="text-align: center;"><a href="{groups.U_LIST}">{L_MEMBERS}</a></td>
<td style="text-align: center;"><!-- IF not groups.S_GROUP_SPECIAL and groups.U_DELETE --><a href="{groups.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
</tr>
<!-- ENDIF -->

8
phpBB/adm/style/acp_main.html
View file

@ -60,10 +60,10 @@
<td><b>{UPLOAD_DIR_SIZE}</b></td>
</tr>
<tr>
<td>{L_DATABASE_SERVER_INFO}: </td>
<td><b>{DATABASE_INFO}</b></td>
<td>{L_GZIP_COMPRESSION}: </td>
<td><b>{GZIP_COMPRESSION}</b></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</tbody>
</table>
@ -104,6 +104,10 @@
<!-- END log -->
</tbody>
</table>
<br />
<div style="text-align: right;"><a href="{U_ADMIN_LOG}">&raquo; {L_VIEW_ADMIN_LOG}</a></div>
<!-- ENDIF -->
<!-- IF S_INACTIVE_USERS -->

14
phpBB/adm/style/acp_styles.html
View file

@ -506,15 +506,16 @@
<p>{L_EXPLAIN}</p>
<!-- IF S_STYLE --> <!-- DEFINE $COLSPAN = 4 --> <!-- ELSE --> <!-- DEFINE $COLSPAN = 3 --> <!-- ENDIF -->
<!-- IF S_STYLE --> <!-- DEFINE $COLSPAN = 5 --> <!-- ELSE --> <!-- DEFINE $COLSPAN = 4 --> <!-- ENDIF -->
<table cellspacing="1">
<col class="row1" /><!-- IF S_STYLE --><col class="row1" /><!-- ENDIF --><col class="row2" />
<col class="row1" /><!-- IF S_STYLE --><col class="row1" /><!-- ENDIF --><col class="row2" /><col class="row2" />
<thead>
<tr>
<th>{L_NAME}</th>
<!-- IF S_STYLE --><th>{L_STYLE_USED_BY}</th><!-- ENDIF -->
<th>{L_OPTIONS}</th>
<th>{L_ACTIONS}</th>
</tr>
</thead>
<tbody>
@ -523,15 +524,18 @@
</tr>
<!-- BEGIN installed -->
<tr>
<td><a href="{installed.U_EDIT}">{installed.NAME}</a><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
<td><strong>{installed.NAME}</strong></a><!-- IF installed.S_DEFAULT_STYLE --> *<!-- ENDIF --></td>
<!-- IF S_STYLE -->
<td style="text-align: center;">{installed.STYLE_COUNT}</td>
<!-- ENDIF -->
<td style="text-align: center;">
{installed.S_OPTIONS}
</td>
<td style="text-align: center;">
<!-- IF S_STYLE -->
<a href="{installed.U_STYLE_ACT_DEACT}">{installed.L_STYLE_ACT_DEACT}</a> |
<!-- ENDIF -->
{installed.S_OPTIONS}
{installed.S_ACTIONS}
<!-- IF S_STYLE -->
| <a href="{installed.U_PREVIEW}" onclick="this.target='_preview';">{L_PREVIEW}</a>
<!-- ENDIF -->
@ -548,7 +552,7 @@
<!-- BEGIN uninstalled -->
<tr>
<td<!-- IF S_STYLE --> colspan="2"<!-- ENDIF -->><b>{uninstalled.NAME}</b><br /><span>{L_COPYRIGHT}: {uninstalled.COPYRIGHT}</span></td>
<td style="text-align: center;"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td>
<td style="text-align: center;" colspan="2"><a href="{uninstalled.U_INSTALL}">{L_INSTALL}</a></td>
</tr>
<!-- END uninstalled -->
</tbody>

2
phpBB/download.php
View file

@ -81,7 +81,7 @@ if (!$attachment['in_message'])
else
{
$row['forum_id'] = 0;
if (!$auth->acl_get('u_pm_download') || !$config['auth_download_pm'])
if (!$auth->acl_get('u_pm_download'))
{
trigger_error('SORRY_AUTH_VIEW_ATTACH');
}

14
phpBB/includes/acm/acm_file.php
View file

@ -69,7 +69,7 @@ class acm
}
global $phpEx;
$file = '<?php $this->vars=' . $this->format_array($this->vars) . ";\n\$this->var_expires=" . $this->format_array($this->var_expires) . ' ?>';
$file = "<?php\n\$this->vars = " . $this->format_array($this->vars) . ";\n\n\$this->var_expires = " . $this->format_array($this->var_expires) . "\n?>";
if ($fp = @fopen($this->cache_dir . 'data_global.' . $phpEx, 'wb'))
{
@ -255,26 +255,28 @@ class acm
/**
* Format an array to be stored on filesystem
*/
function format_array($array)
function format_array($array, $tab = '')
{
$tab .= "\t";
$lines = array();
foreach ($array as $k => $v)
{
if (is_array($v))
{
$lines[] = "\n'$k' => " . $this->format_array($v);
$lines[] = "\n{$tab}'$k' => " . $this->format_array($v, $tab);
}
else if (is_int($v))
{
$lines[] = "\n'$k' => $v";
$lines[] = "\n{$tab}'$k' => $v";
}
else if (is_bool($v))
{
$lines[] = "\n'$k' => " . (($v) ? 'true' : 'false');
$lines[] = "\n{$tab}'$k' => " . (($v) ? 'true' : 'false');
}
else
{
$lines[] = "\n'$k' => '" . str_replace("'", "\\'", str_replace('\\', '\\\\', $v)) . "'";
$lines[] = "\n{$tab}'$k' => '" . str_replace("'", "\\'", str_replace('\\', '\\\\', $v)) . "'";
}
}

9
phpBB/includes/acp/acp_board.php
View file

@ -71,6 +71,14 @@ class acp_board
'allow_sig_smilies' => array('lang' => 'ALLOW_SIG_SMILIES', 'type' => 'radio:yes_no', 'explain' => false),
'allow_nocensors' => array('lang' => 'ALLOW_NO_CENSORS', 'type' => 'radio:yes_no', 'explain' => true),
'allow_bookmarks' => array('lang' => 'ALLOW_BOOKMARKS', 'type' => 'radio:yes_no', 'explain' => true),
'legend2' => 'ACP_LOAD_SETTINGS',
'load_birthdays' => array('lang' => 'YES_BIRTHDAYS', 'type' => 'radio:yes_no', 'explain' => false),
'load_moderators' => array('lang' => 'YES_MODERATORS', 'type' => 'radio:yes_no', 'explain' => false),
'load_jumpbox' => array('lang' => 'YES_JUMPBOX', 'type' => 'radio:yes_no', 'explain' => false),
'load_cpf_memberlist' => array('lang' => 'LOAD_CPF_MEMBERLIST', 'type' => 'radio:yes_no', 'explain' => false),
'load_cpf_viewprofile' => array('lang' => 'LOAD_CPF_VIEWPROFILE', 'type' => 'radio:yes_no', 'explain' => false),
'load_cpf_viewtopic' => array('lang' => 'LOAD_CPF_VIEWTOPIC', 'type' => 'radio:yes_no', 'explain' => false),
)
);
break;
@ -111,7 +119,6 @@ class acp_board
'auth_bbcode_pm' => array('lang' => 'ALLOW_BBCODE_PM', 'type' => 'radio:yes_no', 'explain' => false),
'auth_smilies_pm' => array('lang' => 'ALLOW_SMILIES_PM', 'type' => 'radio:yes_no', 'explain' => false),
'allow_pm_attach' => array('lang' => 'ALLOW_PM_ATTACHMENTS', 'type' => 'radio:yes_no', 'explain' => false),
'auth_download_pm' => array('lang' => 'ALLOW_DOWNLOAD_PM', 'type' => 'radio:yes_no', 'explain' => false),
'allow_sig_pm' => array('lang' => 'ALLOW_SIG_PM', 'type' => 'radio:yes_no', 'explain' => false),
'print_pm' => array('lang' => 'ALLOW_PRINT_PM', 'type' => 'radio:yes_no', 'explain' => false),
'forward_pm' => array('lang' => 'ALLOW_FORWARD_PM', 'type' => 'radio:yes_no', 'explain' => false),

20
phpBB/includes/acp/acp_forums.php
View file

@ -111,6 +111,7 @@ class acp_forums
'enable_indexing' => request_var('enable_indexing',true),
'enable_icons' => request_var('enable_icons', false),
'enable_prune' => request_var('enable_prune', false),
'enable_post_review' => request_var('enable_post_review', true),
'prune_days' => request_var('prune_days', 7),
'prune_viewed' => request_var('prune_viewed', 7),
'prune_freq' => request_var('prune_freq', 1),
@ -318,12 +319,13 @@ class acp_forums
if ($update)
{
$forum_data['forum_flags'] = 0;
$forum_data['forum_flags'] += (request_var('forum_link_track', false)) ? 1 : 0;
$forum_data['forum_flags'] += (request_var('prune_old_polls', false)) ? 2 : 0;
$forum_data['forum_flags'] += (request_var('prune_announce', false)) ? 4 : 0;
$forum_data['forum_flags'] += (request_var('prune_sticky', false)) ? 8 : 0;
$forum_data['forum_flags'] += ($forum_data['show_active']) ? 16 : 0;
$forum_data['forum_flags'] = 0;
$forum_data['forum_flags'] += (request_var('forum_link_track', false)) ? 1 : 0;
$forum_data['forum_flags'] += (request_var('prune_old_polls', false)) ? 2 : 0;
$forum_data['forum_flags'] += (request_var('prune_announce', false)) ? 4 : 0;
$forum_data['forum_flags'] += (request_var('prune_sticky', false)) ? 8 : 0;
$forum_data['forum_flags'] += ($forum_data['show_active']) ? 16 : 0;
$forum_data['forum_flags'] += (request_var('enable_post_review', true)) ? 32 : 0;
}
// Show form to create/modify a forum
@ -520,15 +522,16 @@ class acp_forums
'S_FORUM_ORIG_POST' => (isset($old_forum_type) && $old_forum_type == FORUM_POST) ? true : false,
'S_FORUM_LINK' => ($forum_data['forum_type'] == FORUM_LINK) ? true : false,
'S_FORUM_CAT' => ($forum_data['forum_type'] == FORUM_CAT) ? true : false,
'S_FORUM_LINK_TRACK' => ($forum_data['forum_flags'] & 1) ? true : false,
'S_ENABLE_INDEXING' => ($forum_data['enable_indexing']) ? true : false,
'S_TOPIC_ICONS' => ($forum_data['enable_icons']) ? true : false,
'S_DISPLAY_ON_INDEX' => ($forum_data['display_on_index']) ? true : false,
'S_PRUNE_ENABLE' => ($forum_data['enable_prune']) ? true : false,
'S_FORUM_LINK_TRACK' => ($forum_data['forum_flags'] & 1) ? true : false,
'S_PRUNE_OLD_POLLS' => ($forum_data['forum_flags'] & 2) ? true : false,
'S_PRUNE_ANNOUNCE' => ($forum_data['forum_flags'] & 4) ? true : false,
'S_PRUNE_STICKY' => ($forum_data['forum_flags'] & 8) ? true : false,
'S_DISPLAY_ACTIVE_TOPICS' => ($forum_data['forum_flags'] & 16) ? true : false,
'S_ENABLE_POST_REVIEW' => ($forum_data['forum_flags'] & 32) ? true : false,
)
);
@ -757,12 +760,14 @@ class acp_forums
// 4 = prune announcements
// 8 = prune stickies
// 16 = show active topics
// 32 = enable post review
$forum_data['forum_flags'] = 0;
$forum_data['forum_flags'] += ($forum_data['forum_link_track']) ? 1 : 0;
$forum_data['forum_flags'] += ($forum_data['prune_old_polls']) ? 2 : 0;
$forum_data['forum_flags'] += ($forum_data['prune_announce']) ? 4 : 0;
$forum_data['forum_flags'] += ($forum_data['prune_sticky']) ? 8 : 0;
$forum_data['forum_flags'] += ($forum_data['show_active']) ? 16 : 0;
$forum_data['forum_flags'] += ($forum_data['enable_post_review']) ? 32 : 0;
// Unset data that are not database fields
$forum_data_sql = $forum_data;
@ -772,6 +777,7 @@ class acp_forums
unset($forum_data_sql['prune_announce']);
unset($forum_data_sql['prune_sticky']);
unset($forum_data_sql['show_active']);
unset($forum_data_sql['enable_post_review']);
unset($forum_data_sql['forum_password_confirm']);
// What are we going to do tonight Brain? The same thing we do everynight,

19
phpBB/includes/acp/acp_groups.php
View file

@ -85,7 +85,7 @@ class acp_groups
break;
}
trigger_error($user->lang[$message] . adm_back_link($this->u_action));
trigger_error($user->lang[$message] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
break;
case 'default':
@ -134,7 +134,7 @@ class acp_groups
group_user_attributes('default', $group_id, $mark_ary, false, $group_row['group_name'], $group_row);
}
trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action));
trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
}
else
{
@ -165,7 +165,7 @@ class acp_groups
case 'delete':
if (!$auth->acl_get('a_groupdel'))
{
trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action));
trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
}
$error = group_delete($group_id, $group_row['group_name']);
@ -178,7 +178,7 @@ class acp_groups
if ($error)
{
trigger_error($user->lang[$error] . adm_back_link($this->u_action));
trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
}
$message = ($action == 'delete') ? 'GROUP_DELETED' : 'GROUP_USERS_REMOVE';
@ -204,7 +204,7 @@ class acp_groups
if (!$name_ary)
{
trigger_error($user->lang['NO_USERS'] . adm_back_link($this->u_action));
trigger_error($user->lang['NO_USERS'] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
}
$name_ary = array_unique(explode("\n", $name_ary));
@ -212,11 +212,11 @@ class acp_groups
// Add user/s to group
if ($error = group_user_add($group_id, false, $name_ary, $group_row['group_name'], $default, $leader, 0, $group_row))
{
trigger_error($user->lang[$error] . adm_back_link($this->u_action));
trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
}
$message = ($action == 'addleaders') ? 'GROUP_MODS_ADDED' : 'GROUP_USERS_ADDED';
trigger_error($user->lang[$message] . adm_back_link($this->u_action));
trigger_error($user->lang[$message] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id));
break;
case 'edit':
@ -607,10 +607,12 @@ class acp_groups
'S_ON_PAGE' => on_page($total_members, $config['topics_per_page'], $start),
'PAGINATION' => generate_pagination($this->u_action . "&amp;action=$action&amp;g=$group_id", $total_members, $config['topics_per_page'], $start, true),
'GROUP_NAME' => ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'],
'U_ACTION' => $this->u_action . "&amp;g=$group_id",
'U_BACK' => $this->u_action,
'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=list&amp;field=usernames'))
'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=list&amp;field=usernames'),
'U_DEFAULT_ALL' => "{$this->u_action}&amp;action=default&amp;g=$group_id")
);
foreach ($group_data['leader'] as $row)
@ -701,7 +703,6 @@ class acp_groups
$template->assign_block_vars('groups', array(
'U_LIST' => "{$this->u_action}&amp;action=list&amp;g=$group_id",
'U_DEFAULT' => "{$this->u_action}&amp;action=default&amp;g=$group_id",
'U_EDIT' => "{$this->u_action}&amp;action=edit&amp;g=$group_id",
'U_DELETE' => ($auth->acl_get('a_groupdel')) ? "{$this->u_action}&amp;action=delete&amp;g=$group_id" : '',

2
phpBB/includes/acp/acp_main.php
View file

@ -412,8 +412,10 @@ class acp_main
'DBSIZE' => $dbsize,
'UPLOAD_DIR_SIZE' => $upload_dir_size,
'GZIP_COMPRESSION' => ($config['gzip_compress']) ? $user->lang['ON'] : $user->lang['OFF'],
'DATABASE_INFO' => $db->sql_server_info(),
'U_ACTION' => append_sid("{$phpbb_admin_path}index.$phpEx"),
'U_ADMIN_LOG' => append_sid("{$phpbb_admin_path}index.$phpEx", 'i=logs&amp;mode=admin'),
'S_ACTION_OPTIONS' => ($auth->acl_get('a_board')) ? $s_action_options : '',
)

7
phpBB/includes/acp/acp_modules.php
View file

@ -792,9 +792,12 @@ class acp_modules
{
$this->move_module($module_data['module_id'], $module_data['parent_id']);
}
$update_ary = $module_data;
unset($update_ary['module_id']);
$sql = 'UPDATE ' . MODULES_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $module_data) . "
SET ' . $db->sql_build_array('UPDATE', $update_ary) . "
WHERE module_class = '" . $db->sql_escape($this->module_class) . "'
AND module_id = {$module_data['module_id']}";
$db->sql_query($sql);

21
phpBB/includes/acp/acp_styles.php
View file

@ -82,7 +82,7 @@ parse_css_file = {PARSE_CSS_FILE}
pagination_sep = \'{PAGINATION_SEP}\'
';
$this->imageset_keys = 'site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_info, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_friend, btn_foe, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_moved, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, folder_global, folder_global_posted, folder_global_new, folder_global_new_posted, poll_left, poll_center, poll_right, attach_progress_bar, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10';
$this->imageset_keys = 'site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_info, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_friend, btn_foe, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_moved, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_locked_announce, folder_locked_announce_new, folder_locked_announce_posted, folder_locked_announce_new_posted, folder_locked_global, folder_locked_global_new, folder_locked_global_posted, folder_locked_global_new_posted, folder_locked_sticky, folder_locked_sticky_new, folder_locked_sticky_posted, folder_locked_sticky_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, folder_global, folder_global_posted, folder_global_new, folder_global_new_posted, poll_left, poll_center, poll_right, attach_progress_bar, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10';
// Execute overall actions
switch ($action)
@ -183,7 +183,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
break;
}
$this->frontend('style', array('details', 'export', 'delete'));
$this->frontend('style', array('details'), array('export', 'delete'));
break;
case 'template':
@ -260,7 +260,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
break;
}
$this->frontend('template', array('cache', 'details', 'refresh', 'edit', 'export', 'delete'));
$this->frontend('template', array('edit', 'cache', 'details'), array('refresh', 'export', 'delete'));
break;
case 'theme':
@ -318,11 +318,11 @@ pagination_sep = \'{PAGINATION_SEP}\'
break;
}
$this->frontend('theme', array('details', 'refresh', 'edit', 'export', 'delete'));
$this->frontend('theme', array('edit', 'details'), array('refresh', 'export', 'delete'));
break;
case 'imageset':
$this->frontend('imageset', array('details', 'edit', 'delete', 'export'));
$this->frontend('imageset', array('edit', 'details'), array('export', 'delete'));
break;
}
}
@ -330,7 +330,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
/**
* Build Frontend with supplied options
*/
function frontend($mode, $options)
function frontend($mode, $options, $actions)
{
global $user, $template, $db, $config, $phpbb_root_path, $phpEx;
@ -408,12 +408,19 @@ pagination_sep = \'{PAGINATION_SEP}\'
$s_options[] = '<a href="' . $this->u_action . "&amp;action=$option&amp;id=" . $row[$mode . '_id'] . '">' . $user->lang[strtoupper($option)] . '</a>';
}
$s_actions = array();
foreach ($actions as $option)
{
$s_actions[] = '<a href="' . $this->u_action . "&amp;action=$option&amp;id=" . $row[$mode . '_id'] . '">' . $user->lang[strtoupper($option)] . '</a>';
}
$template->assign_block_vars('installed', array(
'S_DEFAULT_STYLE' => ($mode == 'style' && $row['style_id'] == $config['default_style']) ? true : false,
'U_EDIT' => $this->u_action . '&amp;action=' . (($mode == 'style') ? 'details' : 'edit') . '&amp;id=' . $row[$mode . '_id'],
'U_STYLE_ACT_DEACT' => $this->u_action . '&amp;action=' . $stylevis . '&amp;id=' . $row[$mode . '_id'],
'L_STYLE_ACT_DEACT' => $user->lang['STYLE_' . strtoupper($stylevis)],
'S_OPTIONS' => implode(' | ', $s_options),
'S_ACTIONS' => implode(' | ', $s_actions),
'U_PREVIEW' => ($mode == 'style') ? append_sid("{$phpbb_root_path}index.$phpEx", "$mode=" . $row[$mode . '_id']) : '',
'NAME' => $row[$mode . '_name'],
@ -1272,7 +1279,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
'forums' => array(
'forum', 'forum_new', 'forum_locked', 'forum_link', 'sub_forum', 'sub_forum_new',),
'folders' => array(
'folder', 'folder_posted', 'folder_new', 'folder_new_posted', 'folder_hot', 'folder_hot_posted', 'folder_hot_new', 'folder_hot_new_posted', 'folder_locked', 'folder_locked_posted', 'folder_locked_new', 'folder_locked_new_posted', 'folder_sticky', 'folder_sticky_posted', 'folder_sticky_new', 'folder_sticky_new_posted', 'folder_announce', 'folder_announce_posted', 'folder_announce_new', 'folder_announce_new_posted', 'folder_global', 'folder_global_posted', 'folder_global_new', 'folder_global_new_posted',),
'folder', 'folder_posted', 'folder_new', 'folder_new_posted', 'folder_hot', 'folder_hot_posted', 'folder_hot_new', 'folder_hot_new_posted', 'folder_locked', 'folder_locked_posted', 'folder_locked_new', 'folder_locked_new_posted', 'folder_locked_announce', 'folder_locked_announce_new', 'folder_locked_announce_posted', 'folder_locked_announce_new_posted', 'folder_locked_global', 'folder_locked_global_new', 'folder_locked_global_posted', 'folder_locked_global_new_posted', 'folder_locked_sticky', 'folder_locked_sticky_new', 'folder_locked_sticky_posted', 'folder_locked_sticky_new_posted', 'folder_sticky', 'folder_sticky_posted', 'folder_sticky_new', 'folder_sticky_new_posted', 'folder_announce', 'folder_announce_posted', 'folder_announce_new', 'folder_announce_new_posted', 'folder_global', 'folder_global_posted', 'folder_global_new', 'folder_global_new_posted',),
'polls' => array(
'poll_left', 'poll_center', 'poll_right',),
);

24
phpBB/includes/acp/acp_users.php
View file

@ -1871,9 +1871,15 @@ class acp_users
// Select auth options
$sql = 'SELECT auth_option, is_local, is_global
FROM ' . ACL_OPTIONS_TABLE . "
WHERE auth_option LIKE '%\_'
AND is_global = 1
ORDER BY auth_option";
WHERE auth_option LIKE '%\_'";
if (SQL_LAYER == 'mssql' || SQL_LAYER == 'mssql_odbc')
{
$sql .= " ESCAPE '\\'";
}
$sql .= 'AND is_global = 1
ORDER BY auth_option';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
@ -1885,9 +1891,15 @@ class acp_users
$sql = 'SELECT auth_option, is_local, is_global
FROM ' . ACL_OPTIONS_TABLE . "
WHERE auth_option LIKE '%\_'
AND is_local = 1
ORDER BY is_global DESC, auth_option";
WHERE auth_option LIKE '%\_'";
if (SQL_LAYER == 'mssql' || SQL_LAYER == 'mssql_odbc')
{
$sql .= " ESCAPE '\\'";
}
$sql .= 'AND is_local = 1
ORDER BY is_global DESC, auth_option';
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))

24
phpBB/includes/db/firebird.php
View file

@ -32,6 +32,7 @@ if (!defined('SQL_LAYER'))
class dbal_firebird extends dbal
{
var $last_query_text = '';
var $service_handle = false;
/**
* Connect to server
@ -45,9 +46,27 @@ class dbal_firebird extends dbal
$this->db_connect_id = ($this->persistency) ? @ibase_pconnect($this->server . ':' . $this->dbname, $this->user, $sqlpassword, false, false, 3) : @ibase_connect($this->server . ':' . $this->dbname, $this->user, $sqlpassword, false, false, 3);
/**
* @todo evaluate the implications of opening a service connection
*/
$this->service_handle = @ibase_service_attach($this->server, $this->user, $sqlpassword);
return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
}
/**
* Version information about used database
*/
function sql_server_info()
{
if ($this->service_handle !== false)
{
return @ibase_server_info($this->service_handle, IBASE_SVC_SERVER_VERSION);
}
return 'Firebird/Interbase';
}
/**
* SQL Transaction
* @access: private
@ -323,6 +342,11 @@ class dbal_firebird extends dbal
*/
function _sql_close()
{
if ($this->service_handle !== false)
{
@ibase_service_detach($this->service_handle);
}
return @ibase_close($this->db_connect_id);
}

22
phpBB/includes/db/mssql.php
View file

@ -55,6 +55,28 @@ class dbal_mssql extends dbal
return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
}
/**
* Version information about used database
*/
function sql_server_info()
{
$result_id = @mssql_query("SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY('productlevel'), SERVERPROPERTY('edition')", $this->db_connect_id);
$row = false;
if ($result_id)
{
$row = @mssql_fetch_assoc($result_id);
@mssql_free_result($result_id);
}
if ($row)
{
return 'MSSQL<br />' . implode(' ', $row);
}
return 'MSSQL';
}
/**
* SQL Transaction
* @access: private

22
phpBB/includes/db/mssql_odbc.php
View file

@ -49,6 +49,28 @@ class dbal_mssql_odbc extends dbal
return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
}
/**
* Version information about used database
*/
function sql_server_info()
{
$result_id = @odbc_exec($this->db_connect_id, "SELECT SERVERPROPERTY('productversion'), SERVERPROPERTY('productlevel'), SERVERPROPERTY('edition')");
$row = false;
if ($result_id)
{
$row = @odbc_fetch_array($result_id);
@odbc_free_result($result_id);
}
if ($row)
{
return 'MSSQL (ODBC)<br />' . implode(' ', $row);
}
return 'MSSQL (ODBC)';
}
/**
* SQL Transaction
* @access: private

8
phpBB/includes/db/mysql.php
View file

@ -55,6 +55,14 @@ class dbal_mysql extends dbal
return $this->sql_error('');
}
/**
* Version information about used database
*/
function sql_server_info()
{
return 'MySQL ' . @mysql_get_server_info($this->db_connect_id);
}
/**
* SQL Transaction
* @access: private

8
phpBB/includes/db/mysql4.php
View file

@ -57,6 +57,14 @@ class dbal_mysql4 extends dbal
return $this->sql_error('');
}
/**
* Version information about used database
*/
function sql_server_info()
{
return 'MySQL ' . @mysql_get_server_info($this->db_connect_id);
}
/**
* SQL Transaction
* @access: private

8
phpBB/includes/db/mysqli.php
View file

@ -57,6 +57,14 @@ class dbal_mysqli extends dbal
return $this->sql_error('');
}
/**
* Version information about used database
*/
function sql_server_info()
{
return 'MySQL(i) ' . @mysqli_get_server_info($this->db_connect_id);
}
/**
* SQL Transaction
* @access: private

8
phpBB/includes/db/oracle.php
View file

@ -47,6 +47,14 @@ class dbal_oracle extends dbal
return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
}
/**
* Version information about used database
*/
function sql_server_info()
{
return 'Oracle ' . @ociserverversion($this->db_connect_id);
}
/**
* SQL Transaction
* @access: private

10
phpBB/includes/db/postgres.php
View file

@ -84,6 +84,16 @@ class dbal_postgres extends dbal
return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
}
/**
* Version information about used database
*/
function sql_server_info()
{
$version = @pg_version($this->db_connect_id);
return 'PostgresSQL' . ((!empty($version)) ? ' ' . $version['client'] : '';
}
/**
* SQL Transaction
* @access: private

8
phpBB/includes/db/sqlite.php
View file

@ -51,6 +51,14 @@ class dbal_sqlite extends dbal
return ($this->db_connect_id) ? true : array('message' => $error);
}
/**
* Version information about used database
*/
function sql_server_info()
{
return 'SQLite ' . @sqlite_libversion();
}
/**
* SQL Transaction
* @access: private

8
phpBB/includes/functions.php
View file

@ -412,7 +412,7 @@ if (!function_exists('realpath'))
$translated_path = '';
foreach($dirs as $key => $value)
foreach ($dirs as $key => $value)
{
if (strlen($value) > 0)
{
@ -2491,6 +2491,12 @@ function page_header($page_title = '', $display_online_list = true)
// Do not change this (it is defined as _f_={forum_id}x within session.php)
$reading_sql = " AND s.session_page LIKE '%\_f\_={$f}x%'";
// Specify escape character for MSSQL
if (SQL_LAYER == 'mssql' || SQL_LAYER == 'mssql_odbc')
{
$reading_sql .= " ESCAPE '\\'";
}
}
// Get number of online guests

23
phpBB/includes/functions_display.php
View file

@ -637,21 +637,44 @@ function topic_status(&$topic_row, $replies, $unread_topic, &$folder_img, &$fold
$topic_type = $user->lang['VIEW_TOPIC_GLOBAL'];
$folder = 'folder_global';
$folder_new = 'folder_global_new';
if ($topic_row['topic_status'] == ITEM_LOCKED)
{
$topic_type = $user->lang['VIEW_TOPIC_LOCKED'];
$folder = 'folder_locked_global';
$folder_new = 'folder_locked_global_new';
}
break;
case POST_ANNOUNCE:
$topic_type = $user->lang['VIEW_TOPIC_ANNOUNCEMENT'];
$folder = 'folder_announce';
$folder_new = 'folder_announce_new';
if ($topic_row['topic_status'] == ITEM_LOCKED)
{
$topic_type = $user->lang['VIEW_TOPIC_LOCKED'];
$folder = 'folder_locked_announce';
$folder_new = 'folder_locked_announce_new';
}
break;
case POST_STICKY:
$topic_type = $user->lang['VIEW_TOPIC_STICKY'];
$folder = 'folder_sticky';
$folder_new = 'folder_sticky_new';
if ($topic_row['topic_status'] == ITEM_LOCKED)
{
$topic_type = $user->lang['VIEW_TOPIC_LOCKED'];
$folder = 'folder_locked_sticky';
$folder_new = 'folder_locked_sticky_new';
}
break;
default:
$topic_type = '';
if ($config['hot_threshold'] && $replies >= $config['hot_threshold'])
{
$folder = 'folder_hot';

6
phpBB/includes/functions_user.php
View file

@ -207,8 +207,6 @@ function user_add($user_row, $cp_data = false)
}
}
$db->sql_transaction('begin');
$sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
$db->sql_query($sql);
@ -237,13 +235,11 @@ function user_add($user_row, $cp_data = false)
);
$db->sql_query($sql);
$db->sql_transaction('commit');
// Now make it the users default group...
group_set_user_default($user_row['group_id'], array($user_id));
// set the newest user and adjust the user count if the user is a normal user and no activation mail is sent
if ($user_row['user_type'] == USER_NORMAL && !$config['require_activation'])
if ($user_row['user_type'] == USER_NORMAL)
{
set_config('newest_user_id', $user_id, true);
set_config('newest_username', $user_row['username'], true);

55
phpBB/includes/mcp/mcp_forum.php
View file

@ -16,6 +16,8 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
global $template, $db, $user, $auth, $cache;
global $phpEx, $phpbb_root_path, $config;
include_once($phpbb_root_path . 'includes/functions_display.' . $phpEx);
$url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . extra_url());
if ($action == 'merge_select')
@ -107,56 +109,11 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
{
$topic_title = '';
if ($row['topic_status'] == ITEM_LOCKED)
{
$folder_img = 'folder_locked';
$folder_alt = 'VIEW_TOPIC_LOCKED';
}
else
{
if ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL)
{
$folder_img = 'folder_announce';
$folder_alt = 'VIEW_TOPIC_ANNOUNCEMENT';
}
else if ($row['topic_type'] == POST_STICKY)
{
$folder_img = 'folder_sticky';
$folder_alt = 'VIEW_TOPIC_STICKY';
}
else if ($row['topic_status'] == ITEM_MOVED)
{
$folder_img = 'folder_moved';
$folder_alt = 'VIEW_TOPIC_MOVED';
}
else
{
$folder_img = 'folder';
$folder_alt = 'NO_NEW_POSTS';
}
}
$replies = ($auth->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies'];
if ($row['topic_type'] == POST_ANNOUNCE || $row['topic_type'] == POST_GLOBAL)
{
$topic_type = $user->lang['VIEW_TOPIC_ANNOUNCEMENT'] . ' ';
}
else if ($row['topic_type'] == POST_STICKY)
{
$topic_type = $user->lang['VIEW_TOPIC_STICKY'] . ' ';
}
else if ($row['topic_status'] == ITEM_MOVED)
{
$topic_type = $user->lang['VIEW_TOPIC_MOVED'] . ' ';
}
else
{
$topic_type = '';
}
if (intval($row['poll_start']))
{
$topic_type .= $user->lang['VIEW_TOPIC_POLL'] . ' ';
}
// Get folder img, topic status/type related informations
$folder_img = $folder_alt = $topic_type = '';
topic_status($row, $replies, false, $folder_img, $folder_alt, $topic_type);
$topic_title = censor_text($row['topic_title']);

1
phpBB/includes/mcp/mcp_notes.php
View file

@ -184,6 +184,7 @@ class mcp_notes
'REPORT_BY' => $row['username'],
'REPORT_AT' => $user->format_date($row['time']),
'ACTION' => $row['action'],
'IP' => $row['ip'],
'ID' => $row['id'])
);
}

2
phpBB/includes/message_parser.php
View file

@ -164,7 +164,7 @@ class bbcode_firstpass extends bbcode
$in = str_replace("\r\n", "\n", str_replace('\"', '"', $in));
// Trimming here to make sure no empty bbcodes are parsed accidently
if (!trim($in))
if (trim($in) == '')
{
return false;
}

4
phpBB/includes/ucp/ucp_pm_compose.php
View file

@ -237,7 +237,7 @@ function compose_pm($id, $mode, $action)
$check_value = 0;
}
if (($to_group_id || isset($address_list['g'])) && !$config['allow_mass_pm'])
if (($to_group_id || isset($address_list['g'])) && (!$config['allow_mass_pm'] || !$auth->acl_get('u_masspm')))
{
trigger_error('NO_AUTH_GROUP_MESSAGE');
}
@ -301,7 +301,7 @@ function compose_pm($id, $mode, $action)
handle_message_list_actions($address_list, $remove_u, $remove_g, $add_to, $add_bcc);
// Check for too many recipients
if (!$config['allow_mass_pm'] && num_recipients($address_list) > 1)
if ((!$config['allow_mass_pm'] || !$auth->acl_get('u_masspm')) && num_recipients($address_list) > 1)
{
$address_list = get_recipient_pos($address_list, 1);
$error[] = $user->lang['TOO_MANY_RECIPIENTS'];

2
phpBB/includes/ucp/ucp_pm_viewfolder.php
View file

@ -195,7 +195,7 @@ function view_folder($id, $mode, $folder_id, $folder)
'PM_ICON_IMG' => (!empty($icons[$row['icon_id']])) ? '<img src="' . $config['icons_path'] . '/' . $icons[$row['icon_id']]['img'] . '" width="' . $icons[$row['icon_id']]['width'] . '" height="' . $icons[$row['icon_id']]['height'] . '" alt="" title="" />' : '',
'FOLDER_IMG' => $user->img($folder_img, $folder_alt),
'PM_IMG' => ($row_indicator) ? $user->img('pm_' . $row_indicator, '') : '',
'ATTACH_ICON_IMG' => ($auth->acl_get('u_download') && $row['message_attachment'] && $config['allow_pm_attach'] && $config['auth_download_pm']) ? $user->img('icon_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
'ATTACH_ICON_IMG' => ($auth->acl_get('u_pm_download') && $row['message_attachment'] && $config['allow_pm_attach']) ? $user->img('icon_attach', $user->lang['TOTAL_ATTACHMENTS']) : '',
'S_PM_DELETED' => ($row['deleted']) ? true : false,

2
phpBB/includes/ucp/ucp_pm_viewmessage.php
View file

@ -85,7 +85,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
if ($message_row['message_attachment'] && $config['allow_pm_attach'])
{
if ($config['auth_download_pm'] && $auth->acl_get('u_pm_download'))
if ($auth->acl_get('u_pm_download'))
{
include($phpbb_root_path . 'includes/functions_display.' . $phpEx);

2
phpBB/includes/ucp/ucp_register.php
View file

@ -202,7 +202,7 @@ class ucp_register
// Which group by default?
$group_reg = ($coppa) ? 'REGISTERED_COPPA' : 'REGISTERED';
$group_inactive = ($coppa) ? 'INACTIVE_COPPA' : 'INACTIVE';
$group_name = ($config['require_activation'] == USER_ACTIVATION_NONE) ? $group_reg : $group_inactive;
$group_name = ($config['require_activation'] == USER_ACTIVATION_NONE || !$config['email_enable']) ? $group_reg : $group_inactive;
$sql = 'SELECT group_id
FROM ' . GROUPS_TABLE . "

34
phpBB/install/install_install.php
View file

@ -1210,12 +1210,6 @@ class install_install extends module
include_once($phpbb_root_path . 'includes/constants.' . $phpEx);
include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx);
// recalculate binary tree
if (!function_exists('recalc_btree'))
{
include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
}
$_module = &new acp_modules();
$module_classes = array('acp', 'mcp', 'ucp');
@ -1362,18 +1356,20 @@ class install_install extends module
{
foreach ($this->module_extras[$module_class] as $cat_name => $mods)
{
$sql = 'SELECT module_id, left_id, right_id FROM ' . MODULES_TABLE . "
WHERE module_langname = '$cat_name'
AND module_class = '$module_class'";
$sql = 'SELECT module_id, left_id, right_id
FROM ' . MODULES_TABLE . "
WHERE module_langname = '" . $db->sql_escape($cat_name) . "'
AND module_class = '" . $db->sql_escape($module_class) . "'";
$result = $db->sql_query_limit($sql, 1);
$row2 = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
foreach ($mods as $mod_name)
{
$sql = 'SELECT * FROM ' . MODULES_TABLE . "
WHERE module_langname = '$mod_name'
AND module_class = '$module_class'
$sql = 'SELECT *
FROM ' . MODULES_TABLE . "
WHERE module_langname = '" . $db->sql_escape($mod_name) . "'
AND module_class = '" . $db->sql_escape($module_class) . "'
AND module_name <> ''";
$result = $db->sql_query_limit($sql, 1);
$module_data = $db->sql_fetchrow($result);
@ -1440,7 +1436,7 @@ class install_install extends module
*/
function add_bots($mode, $sub)
{
global $db, $lang, $phpbb_root_path, $phpEx;
global $db, $lang, $phpbb_root_path, $phpEx, $config;
// Obtain any submitted data
foreach ($this->request_vars as $var)
@ -1448,6 +1444,18 @@ class install_install extends module
$$var = request_var($var, '');
}
// Fill the config array - it is needed by those functions we call
$sql = 'SELECT *
FROM ' . CONFIG_TABLE;
$result = $db->sql_query($sql);
$config = array();
while ($row = $db->sql_fetchrow($result))
{
$config[$row['config_name']] = $row['config_value'];
}
$db->sql_freeresult($result);
$sql = 'SELECT group_id
FROM ' . GROUPS_TABLE . "
WHERE group_name = 'BOTS'";

14
phpBB/install/schemas/firebird_schema.sql
View file

@ -347,7 +347,7 @@ CREATE TABLE phpbb_forums (
forum_last_poster_id INTEGER DEFAULT 0 NOT NULL,
forum_last_post_time INTEGER DEFAULT 0 NOT NULL,
forum_last_poster_name VARCHAR(255),
forum_flags INTEGER DEFAULT 0 NOT NULL,
forum_flags INTEGER DEFAULT 32 NOT NULL,
display_on_index INTEGER DEFAULT 1 NOT NULL,
enable_indexing INTEGER DEFAULT 1 NOT NULL,
enable_icons INTEGER DEFAULT 1 NOT NULL,
@ -1167,6 +1167,18 @@ CREATE TABLE phpbb_styles_imageset (
folder_locked_posted VARCHAR(200) DEFAULT '' NOT NULL,
folder_locked_new VARCHAR(200) DEFAULT '' NOT NULL,
folder_locked_new_posted VARCHAR(200) DEFAULT '' NOT NULL,
folder_locked_announce VARCHAR(200) DEFAULT '' NOT NULL,
folder_locked_announce_new VARCHAR(200) DEFAULT '' NOT NULL,
folder_locked_announce_posted VARCHAR(200) DEFAULT '' NOT NULL,
folder_locked_announce_new_posted VARCHAR(200) DEFAULT '' NOT NULL,
folder_locked_global VARCHAR(200) DEFAULT '' NOT NULL,
folder_locked_global_new VARCHAR(200) DEFAULT '' NOT NULL,
folder_locked_global_posted VARCHAR(200) DEFAULT '' NOT NULL,
folder_locked_global_new_posted VARCHAR(200) DEFAULT '' NOT NULL,
folder_locked_sticky VARCHAR(200) DEFAULT '' NOT NULL,
folder_locked_sticky_new VARCHAR(200) DEFAULT '' NOT NULL,
folder_locked_sticky_posted VARCHAR(200) DEFAULT '' NOT NULL,
folder_locked_sticky_new_posted VARCHAR(200) DEFAULT '' NOT NULL,
folder_sticky VARCHAR(200) DEFAULT '' NOT NULL,
folder_sticky_posted VARCHAR(200) DEFAULT '' NOT NULL,
folder_sticky_new VARCHAR(200) DEFAULT '' NOT NULL,

28
phpBB/install/schemas/mssql_schema.sql
View file

@ -557,7 +557,7 @@ ALTER TABLE [phpbb_forums] WITH NOCHECK ADD
CONSTRAINT [DF_phpbb_forums_forum_last_post_id] DEFAULT (0) FOR [forum_last_post_id],
CONSTRAINT [DF_phpbb_forums_forum_last_poster_id] DEFAULT (0) FOR [forum_last_poster_id],
CONSTRAINT [DF_phpbb_forums_forum_last_post_time] DEFAULT (0) FOR [forum_last_post_time],
CONSTRAINT [DF_phpbb_forums_forum_flags] DEFAULT (0) FOR [forum_flags],
CONSTRAINT [DF_phpbb_forums_forum_flags] DEFAULT (32) FOR [forum_flags],
CONSTRAINT [DF_phpbb_forums_display_on_index] DEFAULT (1) FOR [display_on_index],
CONSTRAINT [DF_phpbb_forums_enable_indexing] DEFAULT (1) FOR [enable_indexing],
CONSTRAINT [DF_phpbb_forums_enable_icons] DEFAULT (1) FOR [enable_icons],
@ -900,7 +900,7 @@ GO
ALTER TABLE [phpbb_poll_options] WITH NOCHECK ADD
CONSTRAINT [DF_phpbb_poll_o_poll_option_id] DEFAULT (0) FOR [poll_option_id],
CONSTRAINT [DF_phpbb_poll_o_poll_option_total] DEFAULT (0) FOR [poll_option_total]
CONSTRAINT [DF_phpbb_poll_o_poll_option_total] DEFAULT (0) FOR [poll_option_total],
CONSTRAINT [DF_phpbb_poll_o_topic_id] DEFAULT (0) FOR [topic_id]
GO
@ -1790,6 +1790,18 @@ CREATE TABLE [phpbb_styles_imageset] (
[folder_locked_posted] [varchar] (200) NOT NULL ,
[folder_locked_new] [varchar] (200) NOT NULL ,
[folder_locked_new_posted] [varchar] (200) NOT NULL ,
[folder_locked_announce] [varchar] (200) NOT NULL ,
[folder_locked_announce_new] [varchar] (200) NOT NULL ,
[folder_locked_announce_posted] [varchar] (200) NOT NULL ,
[folder_locked_announce_new_posted] [varchar] (200) NOT NULL ,
[folder_locked_global] [varchar] (200) NOT NULL ,
[folder_locked_global_new] [varchar] (200) NOT NULL ,
[folder_locked_global_posted] [varchar] (200) NOT NULL ,
[folder_locked_global_new_posted] [varchar] (200) NOT NULL ,
[folder_locked_sticky] [varchar] (200) NOT NULL ,
[folder_locked_sticky_new] [varchar] (200) NOT NULL ,
[folder_locked_sticky_posted] [varchar] (200) NOT NULL ,
[folder_locked_sticky_new_posted] [varchar] (200) NOT NULL ,
[folder_sticky] [varchar] (200) NOT NULL ,
[folder_sticky_posted] [varchar] (200) NOT NULL ,
[folder_sticky_new] [varchar] (200) NOT NULL ,
@ -1881,6 +1893,18 @@ ALTER TABLE [phpbb_styles_imageset] WITH NOCHECK ADD
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_posted] DEFAULT ('') FOR [folder_locked_posted],
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_new] DEFAULT ('') FOR [folder_locked_new],
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_new_posted] DEFAULT ('') FOR [folder_locked_new_posted],
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_announce] DEFAULT ('') FOR [folder_locked_announce],
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_announce_new] DEFAULT ('') FOR [folder_locked_announce_new],
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_announce_posted] DEFAULT ('') FOR [folder_locked_announce_posted],
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_announce_new_posted] DEFAULT ('') FOR [folder_locked_announce_new_posted],
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_global] DEFAULT ('') FOR [folder_locked_global],
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_global_new] DEFAULT ('') FOR [folder_locked_global_new],
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_global_posted] DEFAULT ('') FOR [folder_locked_global_posted],
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_global_new_posted] DEFAULT ('') FOR [folder_locked_global_new_posted],
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_sticky] DEFAULT ('') FOR [folder_locked_sticky],
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_sticky_new] DEFAULT ('') FOR [folder_locked_sticky_new],
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_sticky_posted] DEFAULT ('') FOR [folder_locked_sticky_posted],
CONSTRAINT [DF_phpbb_styles_imageset_folder_locked_sticky_new_posted] DEFAULT ('') FOR [folder_locked_sticky_new_posted],
CONSTRAINT [DF_phpbb_styles_imageset_folder_sticky] DEFAULT ('') FOR [folder_sticky],
CONSTRAINT [DF_phpbb_styles_imageset_folder_sticky_posted] DEFAULT ('') FOR [folder_sticky_posted],
CONSTRAINT [DF_phpbb_styles_imageset_folder_sticky_new] DEFAULT ('') FOR [folder_sticky_new],

14
phpBB/install/schemas/mysql_schema.sql
View file

@ -221,7 +221,7 @@ CREATE TABLE phpbb_forums (
forum_last_poster_id mediumint(8) DEFAULT '0' NOT NULL,
forum_last_post_time int(11) DEFAULT '0' NOT NULL,
forum_last_poster_name varchar(255),
forum_flags tinyint(4) DEFAULT '0' NOT NULL,
forum_flags tinyint(4) DEFAULT '32' NOT NULL,
display_on_index tinyint(1) DEFAULT '1' NOT NULL,
enable_indexing tinyint(1) DEFAULT '1' NOT NULL,
enable_icons tinyint(1) DEFAULT '1' NOT NULL,
@ -753,6 +753,18 @@ CREATE TABLE phpbb_styles_imageset (
folder_locked_posted varchar(200) DEFAULT '' NOT NULL,
folder_locked_new varchar(200) DEFAULT '' NOT NULL,
folder_locked_new_posted varchar(200) DEFAULT '' NOT NULL,
folder_locked_announce varchar(200) DEFAULT '' NOT NULL,
folder_locked_announce_new varchar(200) DEFAULT '' NOT NULL,
folder_locked_announce_posted varchar(200) DEFAULT '' NOT NULL,
folder_locked_announce_new_posted varchar(200) DEFAULT '' NOT NULL,
folder_locked_global varchar(200) DEFAULT '' NOT NULL,
folder_locked_global_new varchar(200) DEFAULT '' NOT NULL,
folder_locked_global_posted varchar(200) DEFAULT '' NOT NULL,
folder_locked_global_new_posted varchar(200) DEFAULT '' NOT NULL,
folder_locked_sticky varchar(200) DEFAULT '' NOT NULL,
folder_locked_sticky_new varchar(200) DEFAULT '' NOT NULL,
folder_locked_sticky_posted varchar(200) DEFAULT '' NOT NULL,
folder_locked_sticky_new_posted varchar(200) DEFAULT '' NOT NULL,
folder_sticky varchar(200) DEFAULT '' NOT NULL,
folder_sticky_posted varchar(200) DEFAULT '' NOT NULL,
folder_sticky_new varchar(200) DEFAULT '' NOT NULL,

18
phpBB/install/schemas/oracle_schema.sql
View file

@ -486,7 +486,7 @@ CREATE TABLE phpbb_forums (
forum_last_poster_id number(8) DEFAULT '0' NOT NULL,
forum_last_post_time number(11) DEFAULT '0' NOT NULL,
forum_last_poster_name varchar2(255),
forum_flags number(4) DEFAULT '0' NOT NULL,
forum_flags number(4) DEFAULT '32' NOT NULL,
display_on_index number(1) DEFAULT '1' NOT NULL,
enable_indexing number(1) DEFAULT '1' NOT NULL,
enable_icons number(1) DEFAULT '1' NOT NULL,
@ -1522,8 +1522,20 @@ CREATE TABLE phpbb_styles_imageset (
folder_locked varchar2(200) DEFAULT '',
folder_locked_posted varchar2(200) DEFAULT '',
folder_locked_new varchar2(200) DEFAULT '',
folder_locked_new_posted varchar2(200) DEFAULT '',
folder_sticky varchar2(200) DEFAULT '',
folder_locked_new_posted varchar2(200) DEFAULT '' NOT NULL,
folder_locked_announce varchar2(200) DEFAULT '' NOT NULL,
folder_locked_announce_new varchar2(200) DEFAULT '' NOT NULL,
folder_locked_announce_posted varchar2(200) DEFAULT '' NOT NULL,
folder_locked_announce_new_posted varchar2(200) DEFAULT '' NOT NULL,
folder_locked_global varchar2(200) DEFAULT '' NOT NULL,
folder_locked_global_new varchar2(200) DEFAULT '' NOT NULL,
folder_locked_global_posted varchar2(200) DEFAULT '' NOT NULL,
folder_locked_global_new_posted varchar2(200) DEFAULT '' NOT NULL,
folder_locked_sticky varchar2(200) DEFAULT '' NOT NULL,
folder_locked_sticky_new varchar2(200) DEFAULT '' NOT NULL,
folder_locked_sticky_posted varchar2(200) DEFAULT '' NOT NULL,
folder_locked_sticky_new_posted varchar2(200) DEFAULT '' NOT NULL,
folder_sticky varchar2(200) DEFAULT '' NOT NULL,
folder_sticky_posted varchar2(200) DEFAULT '',
folder_sticky_new varchar2(200) DEFAULT '',
folder_sticky_new_posted varchar2(200) DEFAULT '',

14
phpBB/install/schemas/postgres_schema.sql
View file

@ -371,7 +371,7 @@ CREATE TABLE phpbb_forums (
forum_last_poster_id INT4 DEFAULT '0' NOT NULL,
forum_last_post_time INT4 DEFAULT '0' NOT NULL,
forum_last_poster_name varchar(255),
forum_flags INT2 DEFAULT '0' NOT NULL,
forum_flags INT2 DEFAULT '32' NOT NULL,
display_on_index INT2 DEFAULT '1' NOT NULL,
enable_indexing INT2 DEFAULT '1' NOT NULL,
enable_icons INT2 DEFAULT '1' NOT NULL,
@ -1118,6 +1118,18 @@ CREATE TABLE phpbb_styles_imageset (
folder_locked_posted varchar(200) DEFAULT '' NOT NULL,
folder_locked_new varchar(200) DEFAULT '' NOT NULL,
folder_locked_new_posted varchar(200) DEFAULT '' NOT NULL,
folder_locked_announce varchar(200) DEFAULT '' NOT NULL,
folder_locked_announce_new varchar(200) DEFAULT '' NOT NULL,
folder_locked_announce_posted varchar(200) DEFAULT '' NOT NULL,
folder_locked_announce_new_posted varchar(200) DEFAULT '' NOT NULL,
folder_locked_global varchar(200) DEFAULT '' NOT NULL,
folder_locked_global_new varchar(200) DEFAULT '' NOT NULL,
folder_locked_global_posted varchar(200) DEFAULT '' NOT NULL,
folder_locked_global_new_posted varchar(200) DEFAULT '' NOT NULL,
folder_locked_sticky varchar(200) DEFAULT '' NOT NULL,
folder_locked_sticky_new varchar(200) DEFAULT '' NOT NULL,
folder_locked_sticky_posted varchar(200) DEFAULT '' NOT NULL,
folder_locked_sticky_new_posted varchar(200) DEFAULT '' NOT NULL,
folder_sticky varchar(200) DEFAULT '' NOT NULL,
folder_sticky_posted varchar(200) DEFAULT '' NOT NULL,
folder_sticky_new varchar(200) DEFAULT '' NOT NULL,

6
phpBB/install/schemas/schema_data.sql
View file

@ -33,7 +33,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_smilies', '1
INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_topic_notify', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('attachment_quota', '52428800');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_bbcode_pm', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_download_pm', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_flash_pm', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_img_pm', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('auth_method', 'db');
@ -323,6 +322,7 @@ INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_', 1);
INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendemail', 1);
INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_readpm', 1);
INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendpm', 1);
INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_masspm', 1);
INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendim', 1);
INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_ignoreflood', 1);
INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_hideonline', 1);
@ -381,7 +381,7 @@ INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order)
INSERT INTO phpbb_styles (style_name, style_copyright, template_id, theme_id, imageset_id) VALUES ('subSilver', '&copy; phpBB Group', 1, 1, 1);
# -- phpbb_styles_imageset
INSERT INTO phpbb_styles_imageset (imageset_name, imageset_copyright, imageset_path, site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_info, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_friend, btn_foe, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_moved, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, folder_global, folder_global_posted, folder_global_new, folder_global_new_posted, poll_left, poll_center, poll_right, attach_progress_bar, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10) VALUES ('subSilver', '&copy; phpBB Group', 'subSilver', 'sitelogo.gif*94*170', '{LANG}/btn_post.gif*27*97', '{LANG}/btn_post_pm.gif*27*97', '{LANG}/btn_reply.gif*27*97', '{LANG}/btn_reply_pm.gif*20*90', '{LANG}/btn_locked.gif*27*97', '{LANG}/btn_profile.gif*20*72', '{LANG}/btn_pm.gif*20*72', '{LANG}/btn_delete.gif*20*20', '{LANG}/btn_info.gif*20*20', '{LANG}/btn_quote.gif*20*90', '{LANG}/btn_search.gif*20*72', '{LANG}/btn_edit.gif*20*90', '{LANG}/btn_report.gif*20*20', '{LANG}/btn_email.gif*20*72', '{LANG}/btn_www.gif*20*72', '{LANG}/btn_icq.gif*20*72', '{LANG}/btn_aim.gif*20*72', '{LANG}/btn_yim.gif*20*72', '{LANG}/btn_msnm.gif*20*72', '{LANG}/btn_jabber.gif*20*72', '{LANG}/btn_online.gif*20*72', '{LANG}/btn_offline.gif*20*72', '', '', 'icon_unapproved.gif*18*19', 'icon_reported.gif*18*19', 'icon_attach.gif*18*14', 'icon_minipost.gif*9*12', 'icon_minipost_new.gif*9*12', 'icon_latest_reply.gif*9*18', 'icon_newest_reply.gif*9*18', 'folder_big.gif*25*46', 'folder_new_big.gif*25*46', 'folder_locked_big.gif*25*46', 'folder_link_big.gif*25*46', 'subfolder_big.gif*25*46', 'subfolder_new_big.gif*25*46', 'folder.gif*18*19', 'folder_moved.gif*18*19', 'folder_posted.gif*18*19', 'folder_new.gif*18*19', 'folder_new_posted.gif*18*19', 'folder_hot.gif*18*19', 'folder_hot_posted.gif*18*19', 'folder_new_hot.gif*18*19', 'folder_new_hot_posted.gif*18*19', 'folder_lock.gif*18*19', 'folder_lock_posted.gif*18*19', 'folder_lock_new.gif*18*19', 'folder_lock_new_posted.gif*18*19', 'folder_sticky.gif*18*19', 'folder_sticky_posted.gif*18*19', 'folder_sticky_new.gif*18*19', 'folder_sticky_new_posted.gif*18*19', 'folder_announce.gif*18*19', 'folder_announce_posted.gif*18*19', 'folder_announce_new.gif*18*19', 'folder_announce_new_posted.gif*18*19', 'folder_announce.gif*18*19', 'folder_announce_posted.gif*18*19', 'folder_announce_new.gif*18*19', 'folder_announce_new_posted.gif*18*19', 'vote_lcap.gif*12*4', 'voting_bar.gif*12', 'vote_rcap.gif*12*4', 'progress_bar.gif*16*280', '', '', '', '', '', '', '', '', '', '');
INSERT INTO phpbb_styles_imageset (imageset_name, imageset_copyright, imageset_path, site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_info, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_friend, btn_foe, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_moved, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_locked_announce, folder_locked_announce_new, folder_locked_announce_posted, folder_locked_announce_new_posted, folder_locked_global, folder_locked_global_new, folder_locked_global_posted, folder_locked_global_new_posted, folder_locked_sticky, folder_locked_sticky_new, folder_locked_sticky_posted, folder_locked_sticky_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, folder_global, folder_global_posted, folder_global_new, folder_global_new_posted, poll_left, poll_center, poll_right, attach_progress_bar, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10) VALUES ('subSilver', '&copy; phpBB Group', 'subSilver', 'sitelogo.gif*94*170', '{LANG}/btn_post.gif*27*97', '{LANG}/btn_post_pm.gif*27*97', '{LANG}/btn_reply.gif*27*97', '{LANG}/btn_reply_pm.gif*20*90', '{LANG}/btn_locked.gif*27*97', '{LANG}/btn_profile.gif*20*72', '{LANG}/btn_pm.gif*20*72', '{LANG}/btn_delete.gif*20*20', '{LANG}/btn_info.gif*20*20', '{LANG}/btn_quote.gif*20*90', '{LANG}/btn_search.gif*20*72', '{LANG}/btn_edit.gif*20*90', '{LANG}/btn_report.gif*20*20', '{LANG}/btn_email.gif*20*72', '{LANG}/btn_www.gif*20*72', '{LANG}/btn_icq.gif*20*72', '{LANG}/btn_aim.gif*20*72', '{LANG}/btn_yim.gif*20*72', '{LANG}/btn_msnm.gif*20*72', '{LANG}/btn_jabber.gif*20*72', '{LANG}/btn_online.gif*20*72', '{LANG}/btn_offline.gif*20*72', '', '', 'icon_unapproved.gif*18*19', 'icon_reported.gif*18*19', 'icon_attach.gif*18*14', 'icon_minipost.gif*9*12', 'icon_minipost_new.gif*9*12', 'icon_latest_reply.gif*9*18', 'icon_newest_reply.gif*9*18', 'folder_big.gif*25*46', 'folder_new_big.gif*25*46', 'folder_locked_big.gif*25*46', 'folder_link_big.gif*25*46', 'subfolder_big.gif*25*46', 'subfolder_new_big.gif*25*46', 'folder.gif*18*19', 'folder_moved.gif*18*19', 'folder_posted.gif*18*19', 'folder_new.gif*18*19', 'folder_new_posted.gif*18*19', 'folder_hot.gif*18*19', 'folder_hot_posted.gif*18*19', 'folder_new_hot.gif*18*19', 'folder_new_hot_posted.gif*18*19', 'folder_lock.gif*18*19', 'folder_lock_posted.gif*18*19', 'folder_lock_new.gif*18*19', 'folder_lock_new_posted.gif*18*19', 'folder_lock_announce.gif*18*19', 'folder_lock_announce_new.gif*18*19', 'folder_lock_announce_posted.gif*18*19', 'folder_lock_announce_new_posted.gif*18*19', 'folder_lock_announce.gif*18*19', 'folder_lock_announce_new.gif*18*19', 'folder_lock_announce_posted.gif*18*19', 'folder_lock_announce_new_posted.gif*18*19', 'folder_lock_sticky.gif*18*19', 'folder_lock_sticky_new.gif*18*19', 'folder_lock_sticky_posted.gif*18*19', 'folder_lock_sticky_new_posted.gif*18*19', 'folder_sticky.gif*18*19', 'folder_sticky_posted.gif*18*19', 'folder_sticky_new.gif*18*19', 'folder_sticky_new_posted.gif*18*19', 'folder_announce.gif*18*19', 'folder_announce_posted.gif*18*19', 'folder_announce_new.gif*18*19', 'folder_announce_new_posted.gif*18*19', 'folder_announce.gif*18*19', 'folder_announce_posted.gif*18*19', 'folder_announce_new.gif*18*19', 'folder_announce_new_posted.gif*18*19', 'vote_lcap.gif*12*4', 'voting_bar.gif*12', 'vote_rcap.gif*12*4', 'progress_bar.gif*16*280', '', '', '', '', '', '', '', '', '', '');
# -- phpbb_styles_template
INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path, bbcode_bitfield) VALUES ('subSilver', '&copy; phpBB Group', 'subSilver', 6921);
@ -444,7 +444,7 @@ INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT
# No Private Messages (u_)
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_', 'u_chgavatar', 'u_chgcensors', 'u_chgemail', 'u_chgpasswd', 'u_download', 'u_hideonline', 'u_sig', 'u_viewprofile');
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_readpm', 'u_sendpm');
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_readpm', 'u_sendpm', 'u_masspm');
# No Avatar (u_)
INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chgavatar', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim');

14
phpBB/install/schemas/sqlite_schema.sql
View file

@ -239,7 +239,7 @@ CREATE TABLE phpbb_forums (
forum_last_poster_id mediumint(8) NOT NULL DEFAULT '0',
forum_last_post_time int(11) NOT NULL DEFAULT '0',
forum_last_poster_name varchar(255),
forum_flags tinyint(4) NOT NULL DEFAULT '0',
forum_flags tinyint(4) NOT NULL DEFAULT '32',
display_on_index tinyint(1) NOT NULL DEFAULT '1',
enable_indexing tinyint(1) NOT NULL DEFAULT '1',
enable_icons tinyint(1) NOT NULL DEFAULT '1',
@ -806,6 +806,18 @@ CREATE TABLE phpbb_styles_imageset (
folder_locked_posted varchar(200) NOT NULL DEFAULT '',
folder_locked_new varchar(200) NOT NULL DEFAULT '',
folder_locked_new_posted varchar(200) NOT NULL DEFAULT '',
folder_locked_announce varchar(200) NOT NULL DEFAULT '',
folder_locked_announce_new varchar(200) NOT NULL DEFAULT '',
folder_locked_announce_posted varchar(200) NOT NULL DEFAULT '',
folder_locked_announce_new_posted varchar(200) NOT NULL DEFAULT '',
folder_locked_global varchar(200) NOT NULL DEFAULT '',
folder_locked_global_new varchar(200) NOT NULL DEFAULT '',
folder_locked_global_posted varchar(200) NOT NULL DEFAULT '',
folder_locked_global_new_posted varchar(200) NOT NULL DEFAULT '',
folder_locked_sticky varchar(200) NOT NULL DEFAULT '',
folder_locked_sticky_new varchar(200) NOT NULL DEFAULT '',
folder_locked_sticky_posted varchar(200) NOT NULL DEFAULT '',
folder_locked_sticky_new_posted varchar(200) NOT NULL DEFAULT '',
folder_sticky varchar(200) NOT NULL DEFAULT '',
folder_sticky_posted varchar(200) NOT NULL DEFAULT '',
folder_sticky_new varchar(200) NOT NULL DEFAULT '',

5
phpBB/language/en/acp/board.php
View file

@ -99,11 +99,10 @@ $lang = array_merge($lang, array(
'ACP_MESSAGE_SETTINGS_EXPLAIN' => 'Here you can set all default settings for private messaging',
'ALLOW_BBCODE_PM' => 'Allow BBCode in private messages',
'ALLOW_DOWNLOAD_PM' => 'Allow downloading of attachments in private messages',
'ALLOW_FLASH_PM' => 'Allow use of FLASH BBCode Tag',
'ALLOW_FORWARD_PM' => 'Allow forwarding of private messages',
'ALLOW_IMG_PM' => 'Allow use of IMG BBCode Tag',
'ALLOW_MASS_PM' => 'Allow Mass PM\'s',
'ALLOW_MASS_PM' => 'Allow sending of private messages to multiple users and groups',
'ALLOW_PRINT_PM' => 'Allow print view in private messaging',
'ALLOW_QUOTE_PM' => 'Allow quotes in private messages',
'ALLOW_SIG_PM' => 'Allow signature in private messages',
@ -114,7 +113,7 @@ $lang = array_merge($lang, array(
'BOXES_MAX_EXPLAIN' => 'By default users may create this many personal folders for private messages.',
'ENABLE_PM_ICONS' => 'Enable use of topic icons in private messages',
'FULL_FOLDER_ACTION' => 'Full folder default action',
'FULL_FOLDER_ACTION_EXPLAIN'=> 'Default Action to take if an users folder is full and if the users folder action set is not applicable. For the special folder "SENTBOX" the default action is always deleting old messages.',
'FULL_FOLDER_ACTION_EXPLAIN'=> 'Default Action to take if an users folder is full and if the users folder action set is not applicable. For the "sent messages" folder the default action is always deleting old messages.',
'HOLD_NEW_MESSAGES' => 'Hold new messages',
'PM_EDIT_TIME' => 'Limit editing time',
'PM_EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a private message not already delivered, zero equals infinity',

7
phpBB/language/en/acp/common.php
View file

@ -188,6 +188,7 @@ $lang = array_merge($lang, array(
'ACP_WORDS' => 'Word Censoring',
'ACTION' => 'Action',
'ACTIONS' => 'Actions',
'ACTIVATE' => 'Activate',
'ADD' => 'Add',
'ADMIN' => 'Administration',
@ -288,12 +289,13 @@ $lang = array_merge($lang, array(
$lang = array_merge($lang, array(
'ADMIN_INTRO' => 'Thank you for choosing phpBB as your forum solution. This screen will give you a quick overview of all the various statistics of your board. The links on the left hand side of this screen allow you to control every aspect of your forum experience. Each page will have instructions on how to use the tools.',
'ADMIN_LOG' => 'Logged administrator actions',
'ADMIN_LOG_INDEX_EXPLAIN' => 'This gives an overview of the last five actions carried out by board administrators. A full copy of the log can be viewed from the appropriate menu item to the left.',
'ADMIN_LOG_INDEX_EXPLAIN' => 'This gives an overview of the last five actions carried out by board administrators. A full copy of the log can be viewed from the appropriate menu item or following the link below.',
'AVATAR_DIR_SIZE' => 'Avatar directory size',
'BOARD_STARTED' => 'Board started',
'DATABASE_SIZE' => 'Database size',
'DATABASE_SERVER_INFO' => 'Database server',
'DATABASE_SIZE' => 'Database size',
'FILES_PER_DAY' => 'Attachments per day',
'FORUM_STATS' => 'Forum Statistics',
@ -326,6 +328,7 @@ $lang = array_merge($lang, array(
'USERS_PER_DAY' => 'Users per day',
'VALUE' => 'Value',
'VIEW_ADMIN_LOG' => 'View administrator log',
'WELCOME_PHPBB' => 'Welcome to phpBB',
));

19
phpBB/language/en/acp/forums.php
View file

@ -38,8 +38,8 @@ $lang = array_merge($lang, array(
'AUTO_PRUNE_VIEWED_EXPLAIN' => 'Number of days since topic was viewed after which topic is removed.',
'COPY_PERMISSIONS' => 'Copy permissions from',
'COPY_PERMISSIONS_ADD_EXPLAIN' => 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.',
'COPY_PERMISSIONS_EDIT_EXPLAIN' => 'If you select to copy permissions, the forum will have the same permissions as the one you select here. This will overwrite any permissions you have previously set for this forum with the permissions of the forum you select here. If no forum is selected the current permissions will be kept.',
'COPY_PERMISSIONS_ADD_EXPLAIN' => 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.',
'COPY_PERMISSIONS_EDIT_EXPLAIN' => 'If you select to copy permissions, the forum will have the same permissions as the one you select here. This will overwrite any permissions you have previously set for this forum with the permissions of the forum you select here. If no forum is selected the current permissions will be kept.',
'CREATE_FORUM' => 'Create new forum',
'DECIDE_MOVE_DELETE_CONTENT' => 'Delete content or move to forum',
@ -49,12 +49,14 @@ $lang = array_merge($lang, array(
'DISPLAY_ACTIVE_TOPICS' => 'Enable active topics',
'DISPLAY_ACTIVE_TOPICS_EXPLAIN' => 'If set to yes active topics in selected subforums will be displayed under this category.',
'EDIT_FORUM' => 'Edit forum',
'ENABLE_INDEXING' => 'Enable search indexing',
'ENABLE_INDEXING_EXPLAIN' => 'If set to yes posts made to this forum will be indexed for searching.',
'ENABLE_RECENT' => 'Display active topics',
'ENABLE_RECENT_EXPLAIN' => 'If set to yes topics made to this forum will be shown in the active topics list.',
'ENABLE_TOPIC_ICONS' => 'Enable Topic Icons',
'EDIT_FORUM' => 'Edit forum',
'ENABLE_INDEXING' => 'Enable search indexing',
'ENABLE_INDEXING_EXPLAIN' => 'If set to yes posts made to this forum will be indexed for searching.',
'ENABLE_POST_REVIEW' => 'Enable post review',
'ENABLE_POST_REVIEW_EXPLAIN' => 'If set to yes users are able to review their post if new posts were made to the topic while users wrote theirs. This should be disabled for chat forums.',
'ENABLE_RECENT' => 'Display active topics',
'ENABLE_RECENT_EXPLAIN' => 'If set to yes topics made to this forum will be shown in the active topics list.',
'ENABLE_TOPIC_ICONS' => 'Enable Topic Icons',
'FORUM_ADMIN' => 'Forum Administration',
'FORUM_ADMIN_EXPLAIN' => 'In phpBB3 there are no categories, everything is forum based. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum.',
@ -81,6 +83,7 @@ $lang = array_merge($lang, array(
'FORUM_PASSWORD_CONFIRM_EXPLAIN' => 'Only needs to be set if a forum password is entered.',
'FORUM_PASSWORD_EXPLAIN' => 'Defines a password for this forum, use the permission system in preference.',
'FORUM_PASSWORD_MISMATCH' => 'The passwords you entered did not match.',
'FORUM_PRUNE_SETTINGS' => 'Forum prune settings',
'FORUM_RESYNCED' => 'Forum "%s" successfully resynced',
'FORUM_RULES_EXPLAIN' => 'Forum Rules are displayed at any page within the given forum.',
'FORUM_RULES_LINK' => 'Link to Forum Rules',

3
phpBB/language/en/acp/groups.php
View file

@ -89,6 +89,9 @@ $lang = array_merge($lang, array(
'GROUP_USERS_EXIST' => 'The selected users are already members.',
'GROUP_USERS_REMOVE' => 'Users removed from group and new defaults set successfully',
'MAKE_DEFAULT_FOR_ALL' => 'Make default group for every member',
'MEMBERS' => 'Members',
'NO_GROUP' => 'No group specified',
'NO_PERMISSIONS' => 'Do not copy permissions',

1
phpBB/language/en/acp/permissions_phpbb.php
View file

@ -93,6 +93,7 @@ $lang = array_merge($lang, array(
'acl_u_sig' => array('lang' => 'Can use signature', 'cat' => 'post'),
'acl_u_sendpm' => array('lang' => 'Can send private messages', 'cat' => 'pm'),
'acl_u_masspm' => array('lang' => 'Can send pm to multiple users and groups', 'cat' => 'pm'),
'acl_u_readpm' => array('lang' => 'Can read private messages', 'cat' => 'pm'),
'acl_u_pm_edit' => array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
'acl_u_pm_delete' => array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),

62
phpBB/language/en/acp/styles.php
View file

@ -168,30 +168,44 @@ $lang = array_merge($lang, array(
'IMG_CAT_KARMA' => 'Karma images',
'IMG_CAT_LOGOS' => 'Logos',
'IMG_CAT_POLLS' => 'Polling images',
'IMG_FOLDER' => 'Topic',
'IMG_FOLDER_ANNOUNCE' => 'Announcement',
'IMG_FOLDER_ANNOUNCE_NEW' => 'Announcement new posts',
'IMG_FOLDER_ANNOUNCE_POSTED' => 'Announcement posted to',
'IMG_FOLDER_ANNOUNCE_NEW_POSTED' => 'Announcement posted to new',
'IMG_FOLDER_GLOBAL' => 'Global',
'IMG_FOLDER_GLOBAL_NEW' => 'Global new posts',
'IMG_FOLDER_GLOBAL_POSTED' => 'Global posted to',
'IMG_FOLDER_GLOBAL_NEW_POSTED' => 'Global posted to new',
'IMG_FOLDER_HOT' => 'Topic hot',
'IMG_FOLDER_HOT_NEW' => 'Topic hot new posts',
'IMG_FOLDER_HOT_POSTED' => 'Topic hot posted to',
'IMG_FOLDER_HOT_NEW_POSTED' => 'Topic hot posted to new',
'IMG_FOLDER_LOCKED' => 'Topic locked',
'IMG_FOLDER_LOCKED_NEW' => 'Topic locked new',
'IMG_FOLDER_LOCKED_POSTED' => 'Topic locked posted to',
'IMG_FOLDER_LOCKED_NEW_POSTED' => 'Topic locked posted to new',
'IMG_FOLDER_NEW' => 'Topic new posts',
'IMG_FOLDER_NEW_POSTED' => 'Topic posted to new',
'IMG_FOLDER_POSTED' => 'Topic posted to',
'IMG_FOLDER_STICKY' => 'Sticky topic',
'IMG_FOLDER_STICKY_POSTED' => 'Sticky topic posted to',
'IMG_FOLDER_STICKY_NEW' => 'Sticky topic new posts',
'IMG_FOLDER_STICKY_NEW_POSTED' => 'Sticky topic posted to new',
'IMG_FOLDER' => 'Topic',
'IMG_FOLDER_ANNOUNCE' => 'Announcement',
'IMG_FOLDER_ANNOUNCE_NEW' => 'Announcement new posts',
'IMG_FOLDER_ANNOUNCE_POSTED' => 'Announcement posted to',
'IMG_FOLDER_ANNOUNCE_NEW_POSTED' => 'Announcement posted to new',
'IMG_FOLDER_GLOBAL' => 'Global',
'IMG_FOLDER_GLOBAL_NEW' => 'Global new posts',
'IMG_FOLDER_GLOBAL_POSTED' => 'Global posted to',
'IMG_FOLDER_GLOBAL_NEW_POSTED' => 'Global posted to new',
'IMG_FOLDER_HOT' => 'Topic hot',
'IMG_FOLDER_HOT_NEW' => 'Topic hot new posts',
'IMG_FOLDER_HOT_POSTED' => 'Topic hot posted to',
'IMG_FOLDER_HOT_NEW_POSTED' => 'Topic hot posted to new',
'IMG_FOLDER_LOCKED' => 'Topic locked',
'IMG_FOLDER_LOCKED_NEW' => 'Topic locked new',
'IMG_FOLDER_LOCKED_POSTED' => 'Topic locked posted to',
'IMG_FOLDER_LOCKED_NEW_POSTED' => 'Topic locked posted to new',
'IMG_FOLDER_LOCKED_ANNOUNCE' => 'Announcement locked',
'IMG_FOLDER_LOCKED_ANNOUNCE_NEW' => 'Announcement locked new posts',
'IMG_FOLDER_LOCKED_ANNOUNCE_POSTED' => 'Announcement locked posted to',
'IMG_FOLDER_LOCKED_ANNOUNCE_NEW_POSTED' => 'Announcement locked posted to new',
'IMG_FOLDER_LOCKED_GLOBAL' => 'Global locked',
'IMG_FOLDER_LOCKED_GLOBAL_NEW' => 'Global locked new posts',
'IMG_FOLDER_LOCKED_GLOBAL_POSTED' => 'Global locked posted to',
'IMG_FOLDER_LOCKED_GLOBAL_NEW_POSTED' => 'Global locked posted to new',
'IMG_FOLDER_LOCKED_STICKY' => 'Sticky topic locked',
'IMG_FOLDER_LOCKED_STICKY_POSTED' => 'Sticky topic locked posted to',
'IMG_FOLDER_LOCKED_STICKY_NEW' => 'Sticky topic locked new posts',
'IMG_FOLDER_LOCKED_STICKY_NEW_POSTED' => 'Sticky topic locked posted to new',
'IMG_FOLDER_NEW' => 'Topic new posts',
'IMG_FOLDER_NEW_POSTED' => 'Topic posted to new',
'IMG_FOLDER_POSTED' => 'Topic posted to',
'IMG_FOLDER_STICKY' => 'Sticky topic',
'IMG_FOLDER_STICKY_POSTED' => 'Sticky topic posted to',
'IMG_FOLDER_STICKY_NEW' => 'Sticky topic new posts',
'IMG_FOLDER_STICKY_NEW_POSTED' => 'Sticky topic posted to new',
'IMG_FORUM' => 'Forum',
'IMG_FORUM_NEW' => 'Forum new posts',
'IMG_FORUM_LOCKED' => 'Forum locked',

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

@ -296,7 +296,7 @@ $lang = array_merge($lang, array(
'PM_ICON' => 'PM icon',
'PM_INBOX' => 'Inbox',
'PM_OUTBOX' => 'Outbox',
'PM_SENTBOX' => 'Sentbox',
'PM_SENTBOX' => 'Sent Messages',
'PM_SUBJECT' => 'Message subject',
'PM_TO' => 'Send to',
'POPUP_ON_PM' => 'Pop up window on new private message',
@ -373,7 +373,7 @@ $lang = array_merge($lang, array(
'UCP_MSNM' => 'MSN Messenger',
'UCP_NO_ATTACHMENTS' => 'You have posted no files',
'UCP_PREFS' => 'Preferences',
'UCP_PREFS' => 'Forum preferences',
'UCP_PREFS_PERSONAL' => 'Personal settings',
'UCP_PREFS_POST' => 'Posting messages',
'UCP_PREFS_VIEW' => 'Viewing posts',

2
phpBB/memberlist.php
View file

@ -975,7 +975,7 @@ switch ($mode)
'RANK_IMG' => $rank_img,
'RANK_IMG_SRC' => $rank_img_src,
'U_PM' => ($auth->acl_get('u_sendpm') && $group_row['group_receive_pm'] && $config['allow_privmsg'] && $config['allow_mass_pm']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;g=' . $group_id) : '',)
'U_PM' => ($auth->acl_get('u_sendpm') && $auth->acl_get('u_masspm') && $group_row['group_receive_pm'] && $config['allow_privmsg'] && $config['allow_mass_pm']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;g=' . $group_id) : '',)
);
$sql_select = ', ug.group_leader';

16
phpBB/posting.php
View file

@ -473,7 +473,7 @@ if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts'))
't' => $topic_id,
'subject' => $subject,
'message' => $message,
), false
)
);
confirm_box(false, 'SAVE_DRAFT', $s_hidden_fields);
@ -617,13 +617,17 @@ if ($submit || $preview || $refresh)
// notify and show user the post made between his request and the final submit
if (($mode == 'reply' || $mode == 'quote') && $post_data['topic_cur_post_id'] && $post_data['topic_cur_post_id'] != $post_data['topic_last_post_id'])
{
if (topic_review($topic_id, $forum_id, 'post_review', $post_data['topic_cur_post_id']))
// Only do so if it is allowed forum-wide
if ($post_data['forum_flags'] & 32)
{
$template->assign_var('S_POST_REVIEW', true);
}
if (topic_review($topic_id, $forum_id, 'post_review', $post_data['topic_cur_post_id']))
{
$template->assign_var('S_POST_REVIEW', true);
}
$submit = false;
$refresh = true;
$submit = false;
$refresh = true;
}
}
// Parse Attachments - before checksum is calculated

BIN
phpBB/styles/subSilver/imageset/folder_lock_announce.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

BIN
phpBB/styles/subSilver/imageset/folder_lock_announce_new.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 292 B

BIN
phpBB/styles/subSilver/imageset/folder_lock_announce_new_posted.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 308 B

BIN
phpBB/styles/subSilver/imageset/folder_lock_announce_posted.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 324 B

BIN
phpBB/styles/subSilver/imageset/folder_lock_sticky.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 338 B

BIN
phpBB/styles/subSilver/imageset/folder_lock_sticky_new.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 324 B

BIN
phpBB/styles/subSilver/imageset/folder_lock_sticky_new_posted.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 336 B

BIN
phpBB/styles/subSilver/imageset/folder_lock_sticky_posted.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 336 B

14
phpBB/styles/subSilver/imageset/imageset.cfg
View file

@ -14,7 +14,7 @@
# the value, then enclose the value with single or double quotes.
# Single and double quotes do not need to be escaped.
#
#
#
# General Information about this style
name = subSilver
@ -73,6 +73,18 @@ img_folder_locked = folder_lock.gif*18*19
img_folder_locked_posted = folder_lock_posted.gif*18*19
img_folder_locked_new = folder_lock_new.gif*18*19
img_folder_locked_new_posted = folder_lock_new_posted.gif*18*19
img_folder_locked_announce = folder_lock_announce.gif*18*19
img_folder_locked_announce_new = folder_lock_announce_new.gif*18*19
img_folder_locked_announce_posted = folder_lock_announce_posted.gif*18*19
img_folder_locked_announce_new_posted = folder_lock_announce_new_posted.gif*18*19
img_folder_locked_global = folder_lock_announce.gif*18*19
img_folder_locked_global_new = folder_lock_announce_new.gif*18*19
img_folder_locked_global_posted = folder_lock_announce_posted.gif*18*19
img_folder_locked_global_new_posted = folder_lock_announce_new_posted.gif*18*19
img_folder_locked_sticky = folder_lock_sticky.gif*18*19
img_folder_locked_sticky_new = folder_lock_sticky_new.gif*18*19
img_folder_locked_sticky_posted = folder_lock_sticky_posted.gif*18*19
img_folder_locked_sticky_new_posted = folder_lock_sticky_new_posted.gif*18*19
img_folder_sticky = folder_sticky.gif*18*19
img_folder_sticky_posted = folder_sticky_posted.gif*18*19
img_folder_sticky_new = folder_sticky_new.gif*18*19

31
phpBB/styles/subSilver/template/mcp_notes_user.html
View file

@ -46,24 +46,41 @@
</tr>
</table>
<br />
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
<tr>
<th colspan="2" align="center">{L_FEEDBACK}</th>
<th colspan="5" align="center">{L_FEEDBACK}</th>
</tr>
<!-- IF S_USER_NOTES -->
<tr align="center">
<td colspan="5" class="row3"><span class="gensmall">{L_DISPLAY_LOG}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}:</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
</tr>
<tr>
<th>{L_REPORT_BY}</th>
<th>{L_IP}</th>
<th>{L_TIME}</th>
<th>{L_ACTION}</th>
<th><!-- IF S_CLEAR_ALLOWED -->{L_MARK}<!-- ENDIF --></th>
</tr>
<!-- BEGIN usernotes -->
<!-- IF usernotes.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td<!-- IF not S_CLEAR_ALLOWED --> colspan="2"<!-- ENDIF -->><span class="gensmall">{L_REPORT_BY}: <b>{usernotes.REPORT_BY}</b> {L_REPORTED}: {usernotes.REPORT_AT}</span><hr /><span class="gen">{usernotes.ACTION}</span></td>
<!-- IF S_CLEAR_ALLOWED --><td width="5%" align="center"><input type="checkbox" class="radio" name="marknote[]" value="{usernotes.ID}" /></td><!-- ENDIF -->
<td class="gen">{usernotes.REPORT_BY}</td>
<td style="text-align: center;">{usernotes.IP}</td>
<td style="text-align: center;">{usernotes.REPORT_AT}</td>
<td class="gen">
{usernotes.ACTION}
<!-- IF usernotes.DATA --><br />&#187; <span class="gensmall">[ {usernotes.DATA} ]</span><!-- ENDIF -->
</td>
<td style="text-align: center;"><!-- IF S_CLEAR_ALLOWED --><input type="checkbox" class="radio" name="marknote[]" value="{usernotes.ID}" /><!-- ENDIF --></td>
</tr>
<!-- END usernotes -->
<tr align="center">
<td class="row3" colspan="2"><span class="gensmall">{L_DISPLAY_POSTS}:</span> {S_SELECT_SORT_DAYS}&nbsp;<span class="gensmall">{L_SORT_BY}</span> {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR}&nbsp;<input class="btnlite" type="submit" value="{L_GO}" name="sort" /></td>
</tr>
<!-- IF S_CLEAR_ALLOWED -->
<tr>
<td class="cat" colspan="2" align="center"><input class="btnlite" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />&nbsp; <input class="btnlite" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" /></td>
<td class="cat" colspan="5" align="center"><input class="btnlite" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />&nbsp; <input class="btnlite" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" /></td>
</tr>
<!-- ENDIF -->

8
phpBB/ucp.php
View file

@ -283,9 +283,9 @@ while ($row = $db->sql_fetchrow($result))
$db->sql_freeresult($result);
// Output PM_TO box if message composing
if ($mode == 'compose' && request_var('action', '') != 'edit')
if ($mode == 'compose' && $auth->acl_get('u_sendpm') && request_var('action', '') != 'edit')
{
if ($config['allow_mass_pm'])
if ($config['allow_mass_pm'] && $auth->acl_get('u_masspm'))
{
$sql = 'SELECT group_id, group_name, group_type
FROM ' . GROUPS_TABLE . '
@ -304,8 +304,8 @@ if ($mode == 'compose' && request_var('action', '') != 'edit')
$template->assign_vars(array(
'S_SHOW_PM_BOX' => true,
'S_ALLOW_MASS_PM' => ($config['allow_mass_pm']),
'S_GROUP_OPTIONS' => ($config['allow_mass_pm']) ? $group_options : '',
'S_ALLOW_MASS_PM' => ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? true : false,
'S_GROUP_OPTIONS' => ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? $group_options : '',
'U_SEARCH_USER' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=post&amp;field=username_list'))
);
}