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

Unused Code inside function update_forum_data [Bug #6606]

Browse source 
Copy permissions protection for groups [Bug #6594]
HTML issues in ACP [Bug #6580, #6578]
Always send the correct encoding [related to bug #6576]
Mass email fixes for first loop iteration [Bug #6570]
Extension groups to be allowed in PM's and/or Posts [Bug #6558]
Extension allowance checking clarified (no longer using forum id 0 for private messaging)
Using request_var() array method for some variables [Bug #6556]
Added confirmation for deletion of ranks/smilies/icons/word censores [Bug #6548, #6530, #6512, #6466]
Only show postable forums in dropdown list for moving posts on forum deletion as well as correct re-indexing [Bug #6510, #6476, #6384]
Jabber password being password field in jabber settings screen [Bug #6478]
user activity language variable if viewing not own profile [Bug #6432]
Show moderator group/user-name colour [Bug #6402]
Log rank creation/updating/removing [Bug #6398]
Update check permission changed from a_ to a_board [Bug #6392]


git-svn-id: file:///svn/phpbb/trunk@6816 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-12-27 17:43:55 +00:00
parent b9da985180
commit 945afbc5fa
41 changed files with 371 additions and 267 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/adm/index.php
View file

@ -154,10 +154,9 @@ function adm_page_header($page_title)
'S_CONTENT_DIR_RIGHT' => $user->lang['RIGHT']) 'S_CONTENT_DIR_RIGHT' => $user->lang['RIGHT'])
); );
if ($config['send_encoding']) // application/xhtml+xml not used because of IE
{ header('Content-type: text/html; charset=UTF-8');
header('Content-type: text/html; charset=UTF-8');
}
header('Cache-Control: private, no-cache="set-cookie"'); header('Cache-Control: private, no-cache="set-cookie"');
header('Expires: 0'); header('Expires: 0');
header('Pragma: no-cache'); header('Pragma: no-cache');

13
phpBB/adm/style/acp_attachments.html
View file

@ -2,6 +2,10 @@
<a name="maincontent"></a> <a name="maincontent"></a>
<!-- IF U_BACK -->
<a href="{U_BACK}" style="float: right">&laquo; {L_BACK}</a>
<!-- ENDIF -->
<h1>{L_TITLE}</h1> <h1>{L_TITLE}</h1>
<p>{L_TITLE_EXPLAIN}</p> <p>{L_TITLE_EXPLAIN}</p>
@ -234,17 +238,18 @@
</thead> </thead>
<tbody> <tbody>
<!-- BEGIN groups --> <!-- BEGIN groups -->
<!-- IF groups.S_ADD_SPACER --> <!-- IF groups.S_ADD_SPACER and not groups.S_FIRST_ROW -->
<tr> <tr>
<td class="spacer" colspan="3">&nbsp;</td> <td class="spacer" colspan="3">&nbsp;</td>
</tr> </tr>
<!-- ENDIF --> <!-- ENDIF -->
<tr> <tr>
<td><a href="{groups.U_EDIT}">{groups.GROUP_NAME}</a> <td><strong>{groups.GROUP_NAME}</strong>
<!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM}</span><!-- ENDIF --> <!-- IF groups.S_GROUP_ALLOWED and not groups.S_ALLOWED_IN_PM --><br /><span>&raquo; {L_NOT_ALLOWED_IN_PM}</span><!-- ENDIF -->
<!-- IF groups.S_ALLOWED_IN_PM and not groups.S_GROUP_ALLOWED --><br /><span>&raquo; {L_ONLY_ALLOWED_IN_PM}</span><!-- ENDIF -->
</td> </td>
<td>{groups.CATEGORY}</td> <td>{groups.CATEGORY}</td>
<td align="center" valign="middle" style="white-space: nowrap;">&nbsp;<a href="{groups.U_EDIT}">{L_EDIT}</a> | <a href="{groups.U_DELETE}">{L_DELETE}</a> | <a href="{groups.U_ACT_DEACT}">{groups.L_ACT_DEACT}</a>&nbsp;</td> <td align="center" valign="middle" style="white-space: nowrap;">&nbsp;<a href="{groups.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{groups.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
</tr> </tr>
<!-- END groups --> <!-- END groups -->
</tbody> </tbody>
@ -323,7 +328,7 @@
<form id="orphan" method="post" action="{U_ACTION}"> <form id="orphan" method="post" action="{U_ACTION}">
<fieldset> <fieldset class="tabulated">
<legend>{L_TITLE}</legend> <legend>{L_TITLE}</legend>
<table cellspacing="1"> <table cellspacing="1">

21
phpBB/adm/style/acp_database.html
View file

@ -12,7 +12,7 @@
<fieldset> <fieldset>
<legend>{L_RESTORE_OPTIONS}</legend> <legend>{L_RESTORE_OPTIONS}</legend>
<dl> <dl>
<dt><label for="user">{L_SELECT_FILE}:</label></dt> <dt><label for="file">{L_SELECT_FILE}:</label></dt>
<dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd> <dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd>
</dl> </dl>
@ -53,26 +53,27 @@
<fieldset> <fieldset>
<legend>{L_BACKUP_OPTIONS}</legend> <legend>{L_BACKUP_OPTIONS}</legend>
<dl> <dl>
<dt><label for="user">{L_BACKUP_TYPE}:</label></dt> <dt><label for="type">{L_BACKUP_TYPE}:</label></dt>
<dd><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" />&nbsp;{L_FULL_BACKUP}&nbsp;&nbsp;<input type="radio" name="type" class="radio" value="structure" id="type" />&nbsp;{L_STRUCTURE_ONLY}&nbsp;&nbsp;<input type="radio" class="radio" name="type" value="data" id="type" />&nbsp;{L_DATA_ONLY}</dd> <dd><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" />&nbsp;{L_FULL_BACKUP}&nbsp;&nbsp;<input type="radio" name="type" class="radio" value="structure" />&nbsp;{L_STRUCTURE_ONLY}&nbsp;&nbsp;<input type="radio" class="radio" name="type" value="data" />&nbsp;{L_DATA_ONLY}</dd>
</dl> </dl>
<dl> <dl>
<dt><label for="user">{L_FILE_TYPE}:</label></dt> <dt><label for="method">{L_FILE_TYPE}:</label></dt>
<dd><!-- BEGIN methods --> <dd><!-- BEGIN methods -->
<input name="method" id="method" type="radio" class="radio" value="{methods.TYPE}"<!-- IF methods.S_FIRST_ROW -->checked="checked"<!-- ENDIF --> />&nbsp;{methods.TYPE} <input name="method"<!-- IF methods.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> type="radio" class="radio" value="{methods.TYPE}" />&nbsp;{methods.TYPE}
<!-- END methods --></dd> <!-- END methods --></dd>
</dl> </dl>
<dl> <dl>
<dt><label for="user">{L_ACTION}:</label></dt> <dt><label for="where">{L_ACTION}:</label></dt>
<dd><input type="radio" class="radio" name="where" value="store_and_download" id="where" checked="checked" />&nbsp;{L_STORE_AND_DOWNLOAD}&nbsp;&nbsp;<input type="radio" class="radio" name="where" value="store" id="where" />&nbsp;{L_STORE_LOCAL}&nbsp;&nbsp;<input type="radio" class="radio" name="where" value="download" id="where" />&nbsp;{L_DOWNLOAD}</dd> <dd><input type="radio" class="radio" name="where" value="store_and_download" id="where" checked="checked" />&nbsp;{L_STORE_AND_DOWNLOAD}&nbsp;&nbsp;<input type="radio" class="radio" name="where" value="store" />&nbsp;{L_STORE_LOCAL}&nbsp;&nbsp;<input type="radio" class="radio" name="where" value="download" />&nbsp;{L_DOWNLOAD}</dd>
</dl> </dl>
<dl> <dl>
<dt><label for="user">{L_TABLE_SELECT}:</label></dt> <dt><label for="table">{L_TABLE_SELECT}:</label></dt>
<dd><select id="table" name="table[]" size="10" multiple="true"> <dd><select id="table" name="table[]" size="10" multiple="multiple">
<!-- BEGIN tables --> <!-- BEGIN tables -->
<option value="{tables.TABLE}">{tables.TABLE}</option> <option value="{tables.TABLE}">{tables.TABLE}</option>
<!-- END tables --> <!-- END tables -->
</select><br /><br /><div align="right"><a href="#" onclick="selector(true)">{L_SELECT_ALL}</a><br /><a href="#" onclick="selector(false)">{L_DESELECT_ALL}</a></div></dd> </select></dd>
<dd><a href="#" onclick="selector(true)">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false)">{L_DESELECT_ALL}</a></dd>
</dl> </dl>
<p class="submit-buttons"> <p class="submit-buttons">

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

@ -44,7 +44,7 @@
<input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" /> <input name="group_type" type="hidden" value="{GROUP_TYPE_SPECIAL}" />
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_ADD_GROUP --> <!-- IF S_ADD_GROUP and S_GROUP_PERM -->
<dl> <dl>
<dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> <dt><label for="group_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt>
<dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd> <dd><select id="group_perm_from" name="group_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_GROUP_OPTIONS}</select></dd>

2
phpBB/adm/style/acp_jabber.html
View file

@ -35,7 +35,7 @@
</dl> </dl>
<dl> <dl>
<dt><label for="jab_password">{L_JAB_PASSWORD}:</label></dt> <dt><label for="jab_password">{L_JAB_PASSWORD}:</label></dt>
<dd><input type="text" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd> <dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd>
</dl> </dl>
<dl> <dl>
<dt><label for="jab_resource">{L_JAB_RESOURCE}:</label><br /><span>{L_JAB_RESOURCE_EXPLAIN}</span></dt> <dt><label for="jab_resource">{L_JAB_RESOURCE}:</label><br /><span>{L_JAB_RESOURCE_EXPLAIN}</span></dt>

9
phpBB/adm/style/acp_search.html
View file

@ -91,10 +91,13 @@
<!-- BEGIN backend --> <!-- BEGIN backend -->
<!-- IF backend.S_STATS --> <!-- IF backend.S_STATS -->
<form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}"> <form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}">
{backend.S_HIDDEN_FIELDS}
<fieldset class="tabulated"> <fieldset class="tabulated">
{backend.S_HIDDEN_FIELDS}
<legend>{L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend> <legend>{L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend>
<table cellspacing="1"> <table cellspacing="1">
@ -130,7 +133,7 @@
<!-- ENDIF --> <!-- ENDIF -->
</p> </p>
</fieldset> </fieldset>
</form> </form>
<!-- END backend --> <!-- END backend -->

5
phpBB/adm/style/acp_words.html
View file

@ -52,7 +52,7 @@
<tr> <tr>
<th>{L_WORD}</th> <th>{L_WORD}</th>
<th>{L_REPLACEMENT}</th> <th>{L_REPLACEMENT}</th>
<th colspan="2">{L_ACTION}</th> <th>{L_ACTION}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -60,8 +60,7 @@
<!-- IF words.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> <!-- IF words.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
<td style="text-align: center;">{words.WORD}</td> <td style="text-align: center;">{words.WORD}</td>
<td style="text-align: center;">{words.REPLACEMENT}</td> <td style="text-align: center;">{words.REPLACEMENT}</td>
<td>&nbsp;<a href="{words.U_EDIT}">{L_EDIT}</a>&nbsp;</td> <td>&nbsp;<a href="{words.U_EDIT}">{ICON_EDIT}</a>&nbsp;&nbsp;<a href="{words.U_DELETE}">{ICON_DELETE}</a>&nbsp;</td>
<td>&nbsp;<a href="{words.U_DELETE}">{L_DELETE}</a>&nbsp;</td>
</tr> </tr>
<!-- END words --> <!-- END words -->
</tbody> </tbody>

7
phpBB/download.php
View file

@ -63,7 +63,8 @@ if ($attachment['is_orphan'])
trigger_error('ERROR_NO_ATTACHMENT'); trigger_error('ERROR_NO_ATTACHMENT');
} }
$extensions = $cache->obtain_attach_extensions(); // Obtain all extensions...
$extensions = $cache->obtain_attach_extensions(true);
} }
else else
{ {
@ -106,14 +107,14 @@ else
} }
else else
{ {
$row['forum_id'] = 0; $row['forum_id'] = false;
if (!$auth->acl_get('u_pm_download')) if (!$auth->acl_get('u_pm_download'))
{ {
trigger_error('SORRY_AUTH_VIEW_ATTACH'); trigger_error('SORRY_AUTH_VIEW_ATTACH');
} }
} }
// disallowed ? // disallowed?
$extensions = array(); $extensions = array();
if (!extension_allowed($row['forum_id'], $attachment['extension'], $extensions)) if (!extension_allowed($row['forum_id'], $attachment['extension'], $extensions))
{ {

100
phpBB/includes/acp/acp_attachments.php
View file

@ -56,8 +56,7 @@ class acp_attachments
$template->assign_vars(array( $template->assign_vars(array(
'L_TITLE' => $user->lang[$l_title], 'L_TITLE' => $user->lang[$l_title],
'L_TITLE_EXPLAIN' => $user->lang[$l_title . '_EXPLAIN'], 'L_TITLE_EXPLAIN' => $user->lang[$l_title . '_EXPLAIN'],
'U_ACTION' => $this->u_action, 'U_ACTION' => $this->u_action)
)
); );
switch ($mode) switch ($mode)
@ -181,8 +180,7 @@ class acp_attachments
$template->assign_vars(array( $template->assign_vars(array(
'U_SEARCH_IMAGICK' => $this->u_action . '&amp;action=imgmagick', 'U_SEARCH_IMAGICK' => $this->u_action . '&amp;action=imgmagick',
'S_THUMBNAIL_SUPPORT' => (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !sizeof($supported_types['format']))) ? false : true, 'S_THUMBNAIL_SUPPORT' => (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !sizeof($supported_types['format']))) ? false : true)
)
); );
// Secure Download Options - Same procedure as with banning // Secure Download Options - Same procedure as with banning
@ -216,8 +214,7 @@ class acp_attachments
'L_SECURE_TITLE' => $user->lang['DEFINE_' . $allow_deny . '_IPS'], 'L_SECURE_TITLE' => $user->lang['DEFINE_' . $allow_deny . '_IPS'],
'L_IP_EXCLUDE' => $user->lang['EXCLUDE_FROM_' . $allow_deny . '_IP'], 'L_IP_EXCLUDE' => $user->lang['EXCLUDE_FROM_' . $allow_deny . '_IP'],
'L_REMOVE_IPS' => $user->lang['REMOVE_' . $allow_deny . '_IPS'], 'L_REMOVE_IPS' => $user->lang['REMOVE_' . $allow_deny . '_IPS'])
)
); );
// Output relevant options // Output relevant options
@ -271,8 +268,8 @@ class acp_attachments
if ($submit) if ($submit)
{ {
// Change Extensions ? // Change Extensions ?
$extension_change_list = (isset($_POST['extension_change_list'])) ? array_map('intval', $_POST['extension_change_list']) : array(); $extension_change_list = request_var('extension_change_list', array(0));
$group_select_list = (isset($_POST['group_select'])) ? array_map('intval', $_POST['group_select']) : array(); $group_select_list = request_var('group_select', array(0));
// Generate correct Change List // Generate correct Change List
$extensions = array(); $extensions = array();
@ -294,7 +291,7 @@ class acp_attachments
$sql = 'UPDATE ' . EXTENSIONS_TABLE . ' $sql = 'UPDATE ' . EXTENSIONS_TABLE . '
SET group_id = ' . (int) $extensions[$row['extension_id']]['group_id'] . ' SET group_id = ' . (int) $extensions[$row['extension_id']]['group_id'] . '
WHERE extension_id = ' . $row['extension_id']; WHERE extension_id = ' . $row['extension_id'];
$db->sql_query($sql); $db->sql_query($sql);
add_log('admin', 'LOG_ATTACH_EXT_UPDATE', $row['extension']); add_log('admin', 'LOG_ATTACH_EXT_UPDATE', $row['extension']);
} }
@ -302,7 +299,7 @@ class acp_attachments
$db->sql_freeresult($result); $db->sql_freeresult($result);
// Delete Extension? // Delete Extension?
$extension_id_list = (isset($_POST['extension_id_list'])) ? array_map('intval', $_POST['extension_id_list']) : array(); $extension_id_list = request_var('extension_id_list', array(0));
if (sizeof($extension_id_list)) if (sizeof($extension_id_list))
{ {
@ -332,7 +329,7 @@ class acp_attachments
$add_extension_group = request_var('add_group_select', 0); $add_extension_group = request_var('add_group_select', 0);
$add = (isset($_POST['add_extension_check'])) ? true : false; $add = (isset($_POST['add_extension_check'])) ? true : false;
if ($add_extension != '' && $add) if ($add_extension && $add)
{ {
if (!sizeof($error)) if (!sizeof($error))
{ {
@ -353,7 +350,7 @@ class acp_attachments
'group_id' => $add_extension_group, 'group_id' => $add_extension_group,
'extension' => $add_extension 'extension' => $add_extension
); );
$db->sql_query('INSERT INTO ' . EXTENSIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); $db->sql_query('INSERT INTO ' . EXTENSIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
add_log('admin', 'LOG_ATTACH_EXT_ADD', $add_extension); add_log('admin', 'LOG_ATTACH_EXT_ADD', $add_extension);
} }
@ -364,7 +361,7 @@ class acp_attachments
{ {
$notify[] = $user->lang['EXTENSIONS_UPDATED']; $notify[] = $user->lang['EXTENSIONS_UPDATED'];
} }
$cache->destroy('_extensions'); $cache->destroy('_extensions');
} }
@ -467,11 +464,11 @@ class acp_attachments
$upload_icon = request_var('upload_icon', 'no_image'); $upload_icon = request_var('upload_icon', 'no_image');
$size_select = request_var('size_select', 'b'); $size_select = request_var('size_select', 'b');
$forum_select = request_var('forum_select', false); $forum_select = request_var('forum_select', false);
$allowed_forums = isset($_POST['allowed_forums']) ? array_map('intval', array_values($_POST['allowed_forums'])) : array(); $allowed_forums = request_var('allowed_forums', array(0));
$allow_in_pm = isset($_POST['allow_in_pm']) ? true : false; $allow_in_pm = (isset($_POST['allow_in_pm'])) ? true : false;
$max_filesize = request_var('max_filesize', 0); $max_filesize = request_var('max_filesize', 0);
$max_filesize = ($size_select == 'kb') ? round($max_filesize * 1024) : (($size_select == 'mb') ? round($max_filesize * 1048576) : $max_filesize); $max_filesize = ($size_select == 'kb') ? round($max_filesize * 1024) : (($size_select == 'mb') ? round($max_filesize * 1048576) : $max_filesize);
$allow_group = (isset($_POST['allow_group'])) ? 1 : 0; $allow_group = (isset($_POST['allow_group'])) ? true : false;
if ($max_filesize == $config['max_filesize']) if ($max_filesize == $config['max_filesize'])
{ {
@ -486,12 +483,12 @@ class acp_attachments
$group_ary = array( $group_ary = array(
'group_name' => $group_name, 'group_name' => $group_name,
'cat_id' => request_var('special_category', ATTACHMENT_CATEGORY_NONE), 'cat_id' => request_var('special_category', ATTACHMENT_CATEGORY_NONE),
'allow_group' => $allow_group, 'allow_group' => ($allow_group) ? 1 : 0,
'download_mode' => request_var('download_mode', INLINE_LINK), 'download_mode' => request_var('download_mode', INLINE_LINK),
'upload_icon' => ($upload_icon == 'no_image') ? '' : $upload_icon, 'upload_icon' => ($upload_icon == 'no_image') ? '' : $upload_icon,
'max_filesize' => $max_filesize, 'max_filesize' => $max_filesize,
'allowed_forums'=> ($forum_select) ? serialize($allowed_forums) : '', 'allowed_forums'=> ($forum_select) ? serialize($allowed_forums) : '',
'allow_in_pm' => ($allow_in_pm) ? 1 : 0 'allow_in_pm' => ($allow_in_pm) ? 1 : 0,
); );
$sql = ($action == 'add') ? 'INSERT INTO ' . EXTENSION_GROUPS_TABLE . ' ' : 'UPDATE ' . EXTENSION_GROUPS_TABLE . ' SET '; $sql = ($action == 'add') ? 'INSERT INTO ' . EXTENSION_GROUPS_TABLE . ' ' : 'UPDATE ' . EXTENSION_GROUPS_TABLE . ' SET ';
@ -508,7 +505,7 @@ class acp_attachments
add_log('admin', 'LOG_ATTACH_EXTGROUP_' . strtoupper($action), $group_name); add_log('admin', 'LOG_ATTACH_EXTGROUP_' . strtoupper($action), $group_name);
} }
$extension_list = isset($_REQUEST['extensions']) ? array_map('intval', array_values($_REQUEST['extensions'])) : array(); $extension_list = request_var('extensions', array(0));
if ($action == 'edit' && sizeof($extension_list)) if ($action == 'edit' && sizeof($extension_list))
{ {
@ -533,7 +530,7 @@ class acp_attachments
$notify[] = $user->lang['SUCCESS_EXTENSION_GROUP_' . strtoupper($action)]; $notify[] = $user->lang['SUCCESS_EXTENSION_GROUP_' . strtoupper($action)];
} }
} }
$cat_lang = array( $cat_lang = array(
ATTACHMENT_CATEGORY_NONE => $user->lang['NO_FILE_CAT'], ATTACHMENT_CATEGORY_NONE => $user->lang['NO_FILE_CAT'],
ATTACHMENT_CATEGORY_IMAGE => $user->lang['CAT_IMAGES'], ATTACHMENT_CATEGORY_IMAGE => $user->lang['CAT_IMAGES'],
@ -581,7 +578,6 @@ class acp_attachments
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
'i' => $id, 'i' => $id,
'mode' => $mode, 'mode' => $mode,
'action' => $action,
'group_id' => $group_id, 'group_id' => $group_id,
'action' => 'delete', 'action' => 'delete',
))); )));
@ -590,7 +586,7 @@ class acp_attachments
break; break;
case 'edit': case 'edit':
if (!$group_id) if (!$group_id)
{ {
trigger_error($user->lang['NO_EXT_GROUP_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['NO_EXT_GROUP_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
@ -608,7 +604,7 @@ class acp_attachments
// no break; // no break;
case 'add': case 'add':
if ($action == 'add') if ($action == 'add')
{ {
$ext_group_row = array( $ext_group_row = array(
@ -620,7 +616,7 @@ class acp_attachments
'upload_icon' => '', 'upload_icon' => '',
'max_filesize' => 0, 'max_filesize' => 0,
); );
$forum_ids = array(); $forum_ids = array();
} }
@ -690,15 +686,15 @@ class acp_attachments
} }
$template->assign_vars(array( $template->assign_vars(array(
'PHPBB_ROOT_PATH' => $phpbb_root_path, 'PHPBB_ROOT_PATH' => $phpbb_root_path,
'IMG_PATH' => $img_path, 'IMG_PATH' => $img_path,
'ACTION' => $action, 'ACTION' => $action,
'GROUP_ID' => $group_id, 'GROUP_ID' => $group_id,
'GROUP_NAME' => $ext_group_row['group_name'], 'GROUP_NAME' => $ext_group_row['group_name'],
'ALLOW_GROUP' => $ext_group_row['allow_group'], 'ALLOW_GROUP' => $ext_group_row['allow_group'],
'ALLOW_IN_PM' => $ext_group_row['allow_in_pm'], 'ALLOW_IN_PM' => $ext_group_row['allow_in_pm'],
'UPLOAD_ICON_SRC' => $phpbb_root_path . $img_path . '/' . $ext_group_row['upload_icon'], 'UPLOAD_ICON_SRC' => $phpbb_root_path . $img_path . '/' . $ext_group_row['upload_icon'],
'EXTGROUP_FILESIZE' => $ext_group_row['max_filesize'], 'EXTGROUP_FILESIZE' => $ext_group_row['max_filesize'],
'ASSIGNED_EXTENSIONS' => $assigned_extensions, 'ASSIGNED_EXTENSIONS' => $assigned_extensions,
'S_CATEGORY_SELECT' => $this->category_select('special_category', $group_id, 'category'), 'S_CATEGORY_SELECT' => $this->category_select('special_category', $group_id, 'category'),
@ -711,9 +707,9 @@ class acp_attachments
'S_FORUM_IDS' => (sizeof($forum_ids)) ? true : false, 'S_FORUM_IDS' => (sizeof($forum_ids)) ? true : false,
'U_EXTENSIONS' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&amp;mode=extensions"), 'U_EXTENSIONS' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&amp;mode=extensions"),
'U_BACK' => $this->u_action,
'L_LEGEND' => $user->lang[strtoupper($action) . '_EXTENSION_GROUP'], 'L_LEGEND' => $user->lang[strtoupper($action) . '_EXTENSION_GROUP'])
)
); );
$s_forum_id_options = ''; $s_forum_id_options = '';
@ -721,11 +717,12 @@ class acp_attachments
$sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id $sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id
FROM ' . FORUMS_TABLE . ' FROM ' . FORUMS_TABLE . '
ORDER BY left_id ASC'; ORDER BY left_id ASC';
$result = $db->sql_query($sql, 600); $result = $db->sql_query($sql);
$right = $cat_right = $padding_inc = 0; $right = $cat_right = $padding_inc = 0;
$padding = $forum_list = $holding = ''; $padding = $forum_list = $holding = '';
$padding_store = array('0' => ''); $padding_store = array('0' => '');
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
if ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id'])) if ($row['forum_type'] == FORUM_CAT && ($row['left_id'] + 1 == $row['right_id']))
@ -777,38 +774,19 @@ class acp_attachments
$template->assign_vars(array( $template->assign_vars(array(
'S_FORUM_ID_OPTIONS' => $s_forum_id_options) 'S_FORUM_ID_OPTIONS' => $s_forum_id_options)
); );
break;
case 'deactivate':
case 'activate':
if (!$group_id)
{
trigger_error($user->lang['NO_EXT_GROUP_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING);
}
$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . '
SET allow_group = ' . (($action == 'activate') ? '1' : '0') . "
WHERE group_id = $group_id";
$db->sql_query($sql);
$this->rewrite_extensions();
break; break;
} }
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . EXTENSION_GROUPS_TABLE . ' FROM ' . EXTENSION_GROUPS_TABLE . '
ORDER BY allow_group DESC, group_name'; ORDER BY allow_group DESC, allow_in_pm DESC, group_name';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$act_deact = 'activate'; $old_allow_group = $old_allow_pm = 1;
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$s_add_spacer = ($row['allow_group'] == 0 && $act_deact == 'deactivate') ? true : false; $s_add_spacer = ($old_allow_group != $row['allow_group'] || $old_allow_pm != $row['allow_in_pm']) ? true : false;
$act_deact = ($row['allow_group']) ? 'deactivate' : 'activate';
$template->assign_block_vars('groups', array( $template->assign_block_vars('groups', array(
'S_ADD_SPACER' => $s_add_spacer, 'S_ADD_SPACER' => $s_add_spacer,
@ -817,14 +795,14 @@ class acp_attachments
'U_EDIT' => $this->u_action . "&amp;action=edit&amp;g={$row['group_id']}", 'U_EDIT' => $this->u_action . "&amp;action=edit&amp;g={$row['group_id']}",
'U_DELETE' => $this->u_action . "&amp;action=delete&amp;g={$row['group_id']}", 'U_DELETE' => $this->u_action . "&amp;action=delete&amp;g={$row['group_id']}",
'U_ACT_DEACT' => $this->u_action . "&amp;action=$act_deact&amp;g={$row['group_id']}",
'L_ACT_DEACT' => $user->lang[strtoupper($act_deact)],
'GROUP_NAME' => $row['group_name'], 'GROUP_NAME' => $row['group_name'],
'CATEGORY' => $cat_lang[$row['cat_id']], 'CATEGORY' => $cat_lang[$row['cat_id']],
) )
); );
$old_allow_group = $row['allow_group'];
$old_allow_pm = $row['allow_in_pm'];
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -1369,7 +1347,7 @@ class acp_attachments
} }
else if (isset($_POST['unsecuresubmit'])) else if (isset($_POST['unsecuresubmit']))
{ {
$unip_sql = array_map('intval', $_POST['unip']); $unip_sql = request_var('unip', array(0));
if (sizeof($unip_sql)) if (sizeof($unip_sql))
{ {

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

@ -278,7 +278,6 @@ class acp_board
'title' => 'ACP_SERVER_SETTINGS', 'title' => 'ACP_SERVER_SETTINGS',
'vars' => array( 'vars' => array(
'legend1' => 'ACP_SERVER_SETTINGS', 'legend1' => 'ACP_SERVER_SETTINGS',
'send_encoding' => array('lang' => 'SEND_ENCODING', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'gzip_compress' => array('lang' => 'ENABLE_GZIP', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), 'gzip_compress' => array('lang' => 'ENABLE_GZIP', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
'legend2' => 'PATH_SETTINGS', 'legend2' => 'PATH_SETTINGS',

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

@ -107,7 +107,12 @@ class acp_email
if ($i == $max_chunk_size || $row['user_lang'] != $old_lang || $row['user_notify_type'] != $old_notify_type) if ($i == $max_chunk_size || $row['user_lang'] != $old_lang || $row['user_notify_type'] != $old_notify_type)
{ {
$i = 0; $i = 0;
$j++;
if (sizeof($email_list))
{
$j++;
}
$old_lang = $row['user_lang']; $old_lang = $row['user_lang'];
$old_notify_type = $row['user_notify_type']; $old_notify_type = $row['user_notify_type'];
} }

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

@ -668,7 +668,7 @@ class acp_forums
if ($db->sql_fetchrow($result)) if ($db->sql_fetchrow($result))
{ {
$template->assign_vars(array( $template->assign_vars(array(
'S_MOVE_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], $subforums_id)) // , false, true, false??? 'S_MOVE_FORUM_OPTIONS' => make_forum_select($forum_data['parent_id'], $subforums_id, false, true)) // , false, true, false???
); );
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -989,7 +989,6 @@ class acp_forums
if ($action_subforums == 'delete') if ($action_subforums == 'delete')
{ {
$log_action_forums = 'FORUMS';
$rows = get_forum_branch($row['forum_id'], 'children', 'descending', false); $rows = get_forum_branch($row['forum_id'], 'children', 'descending', false);
foreach ($rows as $_row) foreach ($rows as $_row)
@ -1055,8 +1054,6 @@ class acp_forums
return array($user->lang['NO_DESTINATION_FORUM']); return array($user->lang['NO_DESTINATION_FORUM']);
} }
$log_action_forums = 'MOVE_FORUMS';
$sql = 'SELECT forum_name $sql = 'SELECT forum_name
FROM ' . FORUMS_TABLE . ' FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . $subforums_to_id; WHERE forum_id = ' . $subforums_to_id;
@ -1115,11 +1112,9 @@ class acp_forums
if ($row['forum_name'] != $forum_data_sql['forum_name']) if ($row['forum_name'] != $forum_data_sql['forum_name'])
{ {
// the forum name has changed, clear the parents list of child forums // the forum name has changed, clear the parents list of all forums (for safety)
$sql = 'UPDATE ' . FORUMS_TABLE . " $sql = 'UPDATE ' . FORUMS_TABLE . "
SET forum_parents = '' SET forum_parents = ''";
WHERE left_id > " . $row['left_id'] . '
AND right_id < ' . $row['right_id'];
$db->sql_query($sql); $db->sql_query($sql);
} }
@ -1374,6 +1369,9 @@ class acp_forums
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
// Grab new forum data for correct tree updating later
$forum_data = $this->get_forum_info($forum_id);
$sql = 'UPDATE ' . FORUMS_TABLE . " $sql = 'UPDATE ' . FORUMS_TABLE . "
SET parent_id = $subforums_to_id SET parent_id = $subforums_to_id
WHERE parent_id = $forum_id"; WHERE parent_id = $forum_id";

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

@ -358,35 +358,49 @@ class acp_groups
$group_perm_from = request_var('group_perm_from', 0); $group_perm_from = request_var('group_perm_from', 0);
// Copy permissions? // Copy permissions?
if ($group_perm_from && $action == 'add') // If the user has the a_authgroups permission and at least one additional permission ability set the permissions are fully transfered.
// We do not limit on one auth category because this can lead to incomplete permissions being tricky to fix for the admin, roles being assigned or added non-default permissions.
// Since the user only has the option to copy permissions from non leader managed groups this seems to be a good compromise.
if ($group_perm_from && $action == 'add' && $auth->acl_get('a_authgroups') && $auth->acl_gets('a_aauth', 'a_fauth', 'a_mauth', 'a_uauth'))
{ {
// From the mysql documentation: $sql = 'SELECT group_manage_founder
// Prior to MySQL 4.0.14, the target table of the INSERT statement cannot appear in the FROM clause of the SELECT part of the query. This limitation is lifted in 4.0.14. FROM ' . GROUPS_TABLE . '
// Due to this we stay on the safe side if we do the insertion "the manual way"
// Copy permisisons from/to the acl groups table (only group_id gets changed)
$sql = 'SELECT forum_id, auth_option_id, auth_role_id, auth_setting
FROM ' . ACL_GROUPS_TABLE . '
WHERE group_id = ' . $group_perm_from; WHERE group_id = ' . $group_perm_from;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$check_row = $db->sql_fetchrow($result);
$groups_sql_ary = array();
while ($row = $db->sql_fetchrow($result))
{
$groups_sql_ary[] = array(
'group_id' => (int) $group_id,
'forum_id' => (int) $row['forum_id'],
'auth_option_id' => (int) $row['auth_option_id'],
'auth_role_id' => (int) $row['auth_role_id'],
'auth_setting' => (int) $row['auth_setting']
);
}
$db->sql_freeresult($result); $db->sql_freeresult($result);
// Now insert the data // Check the group if non-founder
$db->sql_multi_insert(ACL_GROUPS_TABLE, $groups_sql_ary); if ($check_row && ($user->data['user_type'] == USER_FOUNDER || $check_row['group_manage_founder'] == 0))
{
// From the mysql documentation:
// Prior to MySQL 4.0.14, the target table of the INSERT statement cannot appear in the FROM clause of the SELECT part of the query. This limitation is lifted in 4.0.14.
// Due to this we stay on the safe side if we do the insertion "the manual way"
$auth->acl_clear_prefetch(); // Copy permisisons from/to the acl groups table (only group_id gets changed)
$sql = 'SELECT forum_id, auth_option_id, auth_role_id, auth_setting
FROM ' . ACL_GROUPS_TABLE . '
WHERE group_id = ' . $group_perm_from;
$result = $db->sql_query($sql);
$groups_sql_ary = array();
while ($row = $db->sql_fetchrow($result))
{
$groups_sql_ary[] = array(
'group_id' => (int) $group_id,
'forum_id' => (int) $row['forum_id'],
'auth_option_id' => (int) $row['auth_option_id'],
'auth_role_id' => (int) $row['auth_role_id'],
'auth_setting' => (int) $row['auth_setting']
);
}
$db->sql_freeresult($result);
// Now insert the data
$db->sql_multi_insert(ACL_GROUPS_TABLE, $groups_sql_ary);
$auth->acl_clear_prefetch();
}
} }
$cache->destroy('sql', GROUPS_TABLE); $cache->destroy('sql', GROUPS_TABLE);
@ -494,6 +508,7 @@ class acp_groups
$template->assign_vars(array( $template->assign_vars(array(
'S_EDIT' => true, 'S_EDIT' => true,
'S_ADD_GROUP' => ($action == 'add') ? true : false, 'S_ADD_GROUP' => ($action == 'add') ? true : false,
'S_GROUP_PERM' => ($action == 'add' && $auth->acl_get('a_authgroups') && $auth->acl_gets('a_aauth', 'a_fauth', 'a_mauth', 'a_uauth')) ? true : false,
'S_INCLUDE_SWATCH' => true, 'S_INCLUDE_SWATCH' => true,
'S_CAN_UPLOAD' => $can_upload, 'S_CAN_UPLOAD' => $can_upload,
'S_ERROR' => (sizeof($error)) ? true : false, 'S_ERROR' => (sizeof($error)) ? true : false,
@ -518,7 +533,7 @@ class acp_groups
'S_DESC_SMILIES_CHECKED'=> $group_desc_data['allow_smilies'], 'S_DESC_SMILIES_CHECKED'=> $group_desc_data['allow_smilies'],
'S_RANK_OPTIONS' => $rank_options, 'S_RANK_OPTIONS' => $rank_options,
'S_GROUP_OPTIONS' => group_select_options(0), 'S_GROUP_OPTIONS' => group_select_options(false, false, (($user->data['user_type'] == USER_FOUNDER) ? false : 0)),
'AVATAR_IMAGE' => $avatar_img, 'AVATAR_IMAGE' => $avatar_img,
'AVATAR_MAX_FILESIZE' => $config['avatar_filesize'], 'AVATAR_MAX_FILESIZE' => $config['avatar_filesize'],
'GROUP_AVATAR_WIDTH' => (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '', 'GROUP_AVATAR_WIDTH' => (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '',

65
phpBB/includes/acp/acp_icons.php
View file

@ -203,14 +203,14 @@ class acp_icons
$images = (isset($_POST['image'])) ? array_keys(request_var('image', array('' => 0))) : array(); $images = (isset($_POST['image'])) ? array_keys(request_var('image', array('' => 0))) : array();
// Now really get the items // Now really get the items
$image_id = (isset($_POST['id'])) ? array_map('intval', $_POST['id']) : array(); $image_id = (isset($_POST['id'])) ? request_var('id', array(0)) : array();
$image_order = (isset($_POST['order'])) ? array_map('intval', $_POST['order']) : array(); $image_order = (isset($_POST['order'])) ? request_var('order', array(0)) : array();
$image_width = (isset($_POST['width'])) ? array_map('intval', $_POST['width']) : array(); $image_width = (isset($_POST['width'])) ? request_var('width', array(0)) : array();
$image_height = (isset($_POST['height'])) ? array_map('intval', $_POST['height']) : array(); $image_height = (isset($_POST['height'])) ? request_var('height', array(0)) : array();
$image_add = (isset($_POST['add_img'])) ? array_map('intval', $_POST['add_img']) : array(); $image_add = (isset($_POST['add_img'])) ? request_var('add_img', array(0)) : array();
$image_emotion = request_var('emotion', array('' => '')); $image_emotion = request_var('emotion', array('' => ''));
$image_code = request_var('code', array('' => '')); $image_code = request_var('code', array('' => ''));
$image_display_on_posting = (isset($_POST['display_on_posting'])) ? array_map('intval', $_POST['display_on_posting']) : array(); $image_display_on_posting = (isset($_POST['display_on_posting'])) ? request_var('display_on_posting', array(0)) : array();
foreach ($images as $image) foreach ($images as $image)
{ {
@ -530,32 +530,43 @@ class acp_icons
case 'delete': case 'delete':
$sql = "DELETE FROM $table if (confirm_box(true))
WHERE {$fields}_id = $icon_id";
$db->sql_query($sql);
switch ($mode)
{ {
case 'smilies': $sql = "DELETE FROM $table
break; WHERE {$fields}_id = $icon_id";
$db->sql_query($sql);
case 'icons': switch ($mode)
// Reset appropriate icon_ids {
$db->sql_query('UPDATE ' . TOPICS_TABLE . " case 'smilies':
SET icon_id = 0 break;
WHERE icon_id = $icon_id");
$db->sql_query('UPDATE ' . POSTS_TABLE . " case 'icons':
SET icon_id = 0 // Reset appropriate icon_ids
WHERE icon_id = $icon_id"); $db->sql_query('UPDATE ' . TOPICS_TABLE . "
SET icon_id = 0
WHERE icon_id = $icon_id");
break; $db->sql_query('UPDATE ' . POSTS_TABLE . "
SET icon_id = 0
WHERE icon_id = $icon_id");
break;
}
$notice = $user->lang[$lang . '_DELETED'];
$cache->destroy('icons');
$cache->destroy('sql', $table);
}
else
{
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
'i' => $id,
'mode' => $mode,
'id' => $icon_id,
'action' => 'delete',
)));
} }
$notice = $user->lang[$lang . '_DELETED'];
$cache->destroy('icons');
$cache->destroy('sql', $table);
break; break;

4
phpBB/includes/acp/acp_permissions.php
View file

@ -347,7 +347,7 @@ class acp_permissions
$template->assign_vars(array( $template->assign_vars(array(
'S_SELECT_GROUP' => true, 'S_SELECT_GROUP' => true,
'S_GROUP_OPTIONS' => group_select_options(false)) 'S_GROUP_OPTIONS' => group_select_options(false, false, (($user->data['user_type'] == USER_FOUNDER) ? false : 0)))
); );
break; break;
@ -393,7 +393,7 @@ class acp_permissions
'S_SELECT_USERGROUP_VIEW' => ($victim == 'usergroup_view') ? true : false, 'S_SELECT_USERGROUP_VIEW' => ($victim == 'usergroup_view') ? true : false,
'S_DEFINED_USER_OPTIONS' => $items['user_ids_options'], 'S_DEFINED_USER_OPTIONS' => $items['user_ids_options'],
'S_DEFINED_GROUP_OPTIONS' => $items['group_ids_options'], 'S_DEFINED_GROUP_OPTIONS' => $items['group_ids_options'],
'S_ADD_GROUP_OPTIONS' => group_select_options(false, $items['group_ids']), 'S_ADD_GROUP_OPTIONS' => group_select_options(false, $items['group_ids'], (($user->data['user_type'] == USER_FOUNDER) ? false : 0)),
'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=add_user&amp;field=username'), 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=add_user&amp;field=username'),
'UA_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=add_user&field=username', false)) 'UA_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=add_user&field=username', false))
); );

28
phpBB/includes/acp/acp_ranks.php
View file

@ -62,11 +62,15 @@ class acp_ranks
{ {
$sql = 'UPDATE ' . RANKS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE rank_id = $rank_id"; $sql = 'UPDATE ' . RANKS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE rank_id = $rank_id";
$message = $user->lang['RANK_UPDATED']; $message = $user->lang['RANK_UPDATED'];
add_log('admin', 'LOG_RANK_UPDATED', $rank_title);
} }
else else
{ {
$sql = 'INSERT INTO ' . RANKS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); $sql = 'INSERT INTO ' . RANKS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
$message = $user->lang['RANK_ADDED']; $message = $user->lang['RANK_ADDED'];
add_log('admin', 'LOG_RANK_ADDED', $rank_title);
} }
$db->sql_query($sql); $db->sql_query($sql);
@ -78,9 +82,20 @@ class acp_ranks
case 'delete': case 'delete':
// Ok, they want to delete their rank if (!$rank_id)
if ($rank_id)
{ {
trigger_error($user->lang['MUST_SELECT_RANK'] . adm_back_link($this->u_action), E_USER_WARNING);
}
if (confirm_box(true))
{
$sql = 'SELECT rank_title
FROM ' . RANKS_TABLE . '
WHERE rank_id = ' . $rank_id;
$result = $db->sql_query($sql);
$rank_title = (string) $db->sql_fetchfield('rank_title');
$db->sql_freeresult($result);
$sql = 'DELETE FROM ' . RANKS_TABLE . " $sql = 'DELETE FROM ' . RANKS_TABLE . "
WHERE rank_id = $rank_id"; WHERE rank_id = $rank_id";
$db->sql_query($sql); $db->sql_query($sql);
@ -92,11 +107,16 @@ class acp_ranks
$cache->destroy('ranks'); $cache->destroy('ranks');
trigger_error($user->lang['RANK_REMOVED'] . adm_back_link($this->u_action)); add_log('admin', 'LOG_RANK_REMOVED', $rank_title);
} }
else else
{ {
trigger_error($user->lang['MUST_SELECT_RANK'] . adm_back_link($this->u_action), E_USER_WARNING); confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
'i' => $id,
'mode' => $mode,
'rank_id' => $rank_id,
'action' => 'delete',
)));
} }
break; break;

38
phpBB/includes/acp/acp_words.php
View file

@ -110,23 +110,35 @@ class acp_words
trigger_error($user->lang['NO_WORD'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['NO_WORD'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$sql = 'SELECT word if (confirm_box(true))
FROM ' . WORDS_TABLE . " {
WHERE word_id = $word_id"; $sql = 'SELECT word
$result = $db->sql_query($sql); FROM ' . WORDS_TABLE . "
$deleted_word = $db->sql_fetchfield('word'); WHERE word_id = $word_id";
$db->sql_freeresult($result); $result = $db->sql_query($sql);
$deleted_word = $db->sql_fetchfield('word');
$db->sql_freeresult($result);
$sql = 'DELETE FROM ' . WORDS_TABLE . " $sql = 'DELETE FROM ' . WORDS_TABLE . "
WHERE word_id = $word_id"; WHERE word_id = $word_id";
$db->sql_query($sql); $db->sql_query($sql);
$cache->destroy('word_censors'); $cache->destroy('word_censors');
add_log('admin', 'LOG_WORD_DELETE', $deleted_word); add_log('admin', 'LOG_WORD_DELETE', $deleted_word);
trigger_error($user->lang['WORD_REMOVED'] . adm_back_link($this->u_action));
}
else
{
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
'i' => $id,
'mode' => $mode,
'id' => $word_id,
'action' => 'delete',
)));
}
trigger_error($user->lang['WORD_REMOVED'] . adm_back_link($this->u_action));
break; break;
} }

2
phpBB/includes/acp/info/acp_update.php
View file

@ -20,7 +20,7 @@ class acp_update_info
'title' => 'ACP_UPDATE', 'title' => 'ACP_UPDATE',
'version' => '1.0.0', 'version' => '1.0.0',
'modes' => array( 'modes' => array(
'version_check' => array('title' => 'ACP_VERSION_CHECK', 'auth' => 'acl_a_', 'cat' => array('ACP_AUTOMATION')), 'version_check' => array('title' => 'ACP_VERSION_CHECK', 'auth' => 'acl_a_board', 'cat' => array('ACP_AUTOMATION')),
), ),
); );
} }

69
phpBB/includes/cache.php
View file

@ -173,21 +173,29 @@ class cache extends acm
/** /**
* Obtain allowed extensions * Obtain allowed extensions
*
* @param mixed $forum_id If false then check for private messaging, if int then check for forum id. If true, then only return extension informations.
*
* @return array allowed extensions array.
*/ */
function obtain_attach_extensions($forum_id = false) function obtain_attach_extensions($forum_id)
{ {
if (($extensions = $this->get('_extensions')) === false) if (($extensions = $this->get('_extensions')) === false)
{ {
global $db; global $db;
$extensions = array(
'_allowed_post' => array(),
'_allowed_pm' => array(),
);
// The rule is to only allow those extensions defined. ;) // The rule is to only allow those extensions defined. ;)
$sql = 'SELECT e.extension, g.* $sql = 'SELECT e.extension, g.*
FROM ' . EXTENSIONS_TABLE . ' e, ' . EXTENSION_GROUPS_TABLE . ' g FROM ' . EXTENSIONS_TABLE . ' e, ' . EXTENSION_GROUPS_TABLE . ' g
WHERE e.group_id = g.group_id WHERE e.group_id = g.group_id
AND g.allow_group = 1'; AND (g.allow_group = 1 OR g.allow_in_pm = 1)';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$extensions = array('_allowed_' => array());
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$extension = strtolower(trim($row['extension'])); $extension = strtolower(trim($row['extension']));
@ -196,47 +204,62 @@ class cache extends acm
'display_cat' => (int) $row['cat_id'], 'display_cat' => (int) $row['cat_id'],
'download_mode' => (int) $row['download_mode'], 'download_mode' => (int) $row['download_mode'],
'upload_icon' => trim($row['upload_icon']), 'upload_icon' => trim($row['upload_icon']),
'max_filesize' => (int) $row['max_filesize'] 'max_filesize' => (int) $row['max_filesize'],
'allow_group' => $row['allow_group'],
'allow_in_pm' => $row['allow_in_pm'],
); );
$allowed_forums = ($row['allowed_forums']) ? unserialize(trim($row['allowed_forums'])) : array(); $allowed_forums = ($row['allowed_forums']) ? unserialize(trim($row['allowed_forums'])) : array();
if ($row['allow_in_pm']) // Store allowed extensions forum wise
if ($row['allow_group'])
{ {
$allowed_forums = array_merge($allowed_forums, array(0)); $extensions['_allowed_post'][$extension] = (!sizeof($allowed_forums)) ? 0 : $allowed_forums;
} }
// Store allowed extensions forum wise if ($row['allow_in_pm'])
$extensions['_allowed_'][$extension] = (!sizeof($allowed_forums)) ? 0 : $allowed_forums; {
$extensions['_allowed_pm'][$extension] = 0;
}
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
$this->put('_extensions', $extensions); $this->put('_extensions', $extensions);
} }
if ($forum_id !== false) // Forum post
if ($forum_id === false)
{ {
$return = array(); // We are checking for private messages, therefore we only need to get the pm extensions...
$return = array('_allowed_' => array());
foreach ($extensions['_allowed_'] as $extension => $check) foreach ($extensions['_allowed_pm'] as $extension => $check)
{ {
$allowed = false; $return['_allowed_'][$extension] = 0;
$return[$extension] = $extensions[$extension];
}
$extensions = $return;
}
else if ($forum_id === true)
{
return $extensions;
}
else
{
$forum_id = (int) $forum_id;
$return = array('_allowed_' => array());
foreach ($extensions['_allowed_post'] as $extension => $check)
{
// Check for allowed forums
if (is_array($check)) if (is_array($check))
{ {
// Check for private messaging AND all forums allowed $allowed = (!in_array($forum_id, $check)) ? false : true;
if (sizeof($check) == 1 && $check[0] == 0)
{
$allowed = true;
}
else
{
$allowed = (!in_array($forum_id, $check)) ? false : true;
}
} }
else else
{ {
$allowed = ($forum_id === 0) ? false : true; $allowed = true;
} }
if ($allowed) if ($allowed)

47
phpBB/includes/functions.php
View file

@ -2446,7 +2446,7 @@ function smiley_text($text, $force_option = false)
/** /**
* General attachment parsing * General attachment parsing
* *
* @param int $forum_id The forum id the attachments are displayed in (0 for private messages) * @param mixed $forum_id The forum id the attachments are displayed in (false if in private message)
* @param string &$message The post/private message * @param string &$message The post/private message
* @param array &$attachments The attachments to parse for (inline) display. The attachments array will hold templated data after parsing. * @param array &$attachments The attachments to parse for (inline) display. The attachments array will hold templated data after parsing.
* @param array &$update_count The attachment counts to be updated - will be filled * @param array &$update_count The attachment counts to be updated - will be filled
@ -2475,7 +2475,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
if (empty($extensions) || !is_array($extensions)) if (empty($extensions) || !is_array($extensions))
{ {
$extensions = $cache->obtain_attach_extensions(); $extensions = $cache->obtain_attach_extensions($forum_id);
} }
// Look for missing attachment information... // Look for missing attachment information...
@ -2620,7 +2620,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
} }
} }
$download_link = (!$force_physical && $attachment['attach_id']) ? append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&amp;f=' . $forum_id) : $filename; $download_link = (!$force_physical && $attachment['attach_id']) ? append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&amp;f=' . (int) $forum_id) : $filename;
switch ($display_cat) switch ($display_cat)
{ {
@ -2638,7 +2638,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
// Images, but display Thumbnail // Images, but display Thumbnail
case ATTACHMENT_CATEGORY_THUMB: case ATTACHMENT_CATEGORY_THUMB:
$l_downloaded_viewed = $user->lang['VIEWED']; $l_downloaded_viewed = $user->lang['VIEWED'];
$thumbnail_link = (!$force_physical && $attachment['attach_id']) ? append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&amp;t=1&amp;f=' . $forum_id) : $thumbnail_filename; $thumbnail_link = (!$force_physical && $attachment['attach_id']) ? append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&amp;t=1&amp;f=' . (int) $forum_id) : $thumbnail_filename;
$block_array += array( $block_array += array(
'S_THUMBNAIL' => true, 'S_THUMBNAIL' => true,
@ -2754,35 +2754,23 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
} }
/** /**
* Check if extension is allowed to be posted within forum X (forum_id 0 == private messaging) * Check if extension is allowed to be posted.
*
* @param mixed $forum_id The forum id to check or false if private message
* @param string $extension The extension to check, for example zip.
* @param array &$extensions The extension array holding the information from the cache (will be obtained if empty)
*
* @return bool False if the extension is not allowed to be posted, else true.
*/ */
function extension_allowed($forum_id, $extension, &$extensions) function extension_allowed($forum_id, $extension, &$extensions)
{ {
if (!sizeof($extensions)) if (empty($extensions))
{ {
global $cache; global $cache;
$extensions = $cache->obtain_attach_extensions(); $extensions = $cache->obtain_attach_extensions($forum_id);
} }
if (!isset($extensions['_allowed_'][$extension])) return (!isset($extensions['_allowed_'][$extension])) ? false : true;
{
return false;
}
$check = $extensions['_allowed_'][$extension];
if (is_array($check))
{
// Check for private messaging AND all forums allowed
if (sizeof($check) == 1 && $check[0] == 0)
{
return true;
}
return (!in_array($forum_id, $check)) ? false : true;
}
return ($forum_id == 0) ? false : true;
} }
// Little helpers // Little helpers
@ -3700,10 +3688,9 @@ function page_header($page_title = '', $display_online_list = true)
'SITE_LOGO_IMG' => $user->img('site_logo')) 'SITE_LOGO_IMG' => $user->img('site_logo'))
); );
if ($config['send_encoding']) // application/xhtml+xml not used because of IE
{ header('Content-type: text/html; charset=UTF-8');
header('Content-type: text/html; charset=UTF-8');
}
header('Cache-Control: private, no-cache="set-cookie"'); header('Cache-Control: private, no-cache="set-cookie"');
header('Expires: 0'); header('Expires: 0');
header('Pragma: no-cache'); header('Pragma: no-cache');

12
phpBB/includes/functions_admin.php
View file

@ -200,19 +200,27 @@ function size_select_options($size_compare)
} }
/** /**
* Generate list of groups * Generate list of groups (option fields without select)
*
* @param int $group_id The default group id to mark as selected
* @param array $exclude_ids The group ids to exclude from the list, false (default) if you whish to exclude no id
* @param int $manage_founder If set to false (default) all groups are returned, if 0 only those groups returned not being managed by founders only, if 1 only those groups returned managed by founders only.
*
* @return string The list of options.
*/ */
function group_select_options($group_id, $exclude_ids = false) function group_select_options($group_id, $exclude_ids = false, $manage_founder = false)
{ {
global $db, $user, $config; global $db, $user, $config;
$exclude_sql = ($exclude_ids !== false && sizeof($exclude_ids)) ? 'WHERE ' . $db->sql_in_set('group_id', array_map('intval', $exclude_ids), true) : ''; $exclude_sql = ($exclude_ids !== false && sizeof($exclude_ids)) ? 'WHERE ' . $db->sql_in_set('group_id', array_map('intval', $exclude_ids), true) : '';
$sql_and = (!$config['coppa_enable']) ? (($exclude_sql) ? ' AND ' : ' WHERE ') . "group_name <> 'REGISTERED_COPPA'" : ''; $sql_and = (!$config['coppa_enable']) ? (($exclude_sql) ? ' AND ' : ' WHERE ') . "group_name <> 'REGISTERED_COPPA'" : '';
$sql_founder = ($manage_founder !== false) ? (($exclude_sql || $sql_and) ? ' AND ' : ' WHERE ') . 'group_founder_manage = ' . (int) $manage_founder : '';
$sql = 'SELECT group_id, group_name, group_type $sql = 'SELECT group_id, group_name, group_type
FROM ' . GROUPS_TABLE . " FROM ' . GROUPS_TABLE . "
$exclude_sql $exclude_sql
$sql_and $sql_and
$sql_founder
ORDER BY group_type DESC, group_name ASC"; ORDER BY group_type DESC, group_name ASC";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);

43
phpBB/includes/functions_display.php
View file

@ -563,18 +563,43 @@ function get_moderators(&$forum_moderators, $forum_id = false)
return; return;
} }
$forum_sql = 'AND ' . $db->sql_in_set('forum_id', $forum_id); $forum_sql = 'AND m.' . $db->sql_in_set('forum_id', $forum_id);
} }
$sql = 'SELECT * $sql_array = array(
FROM ' . MODERATOR_CACHE_TABLE . " 'SELECT' => 'm.*, u.user_colour, g.group_colour, g.group_type',
WHERE display_on_index = 1
$forum_sql"; 'FROM' => array(
MODERATOR_CACHE_TABLE => 'm',
),
'LEFT_JOIN' => array(
array(
'FROM' => array(USERS_TABLE => 'u'),
'ON' => 'm.user_id = u.user_id',
),
array(
'FROM' => array(GROUPS_TABLE => 'g'),
'ON' => 'm.group_id = g.group_id',
),
),
'WHERE' => "m.display_on_index = 1 $forum_sql",
);
$sql = $db->sql_build_query('SELECT', $sql_array);
$result = $db->sql_query($sql, 3600); $result = $db->sql_query($sql, 3600);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$forum_moderators[$row['forum_id']][] = (!empty($row['user_id'])) ? '<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&amp;u=' . $row['user_id']) . '">' . $row['username'] . '</a>' : '<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp;g=' . $row['group_id']) . '">' . $row['group_name'] . '</a>'; if (!empty($row['user_id']))
{
$forum_moderators[$row['forum_id']][] = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']);
}
else
{
$forum_moderators[$row['forum_id']][] = '<a' . (($row['group_colour']) ? ' style="color:#' . $row['group_colour'] . '"' : '') . ' href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&amp;g=' . $row['group_id']) . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</a>';
}
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -846,13 +871,15 @@ function display_user_activity(&$userdata)
$active_t_pct = ($userdata['user_posts']) ? ($active_t_count / $userdata['user_posts']) * 100 : 0; $active_t_pct = ($userdata['user_posts']) ? ($active_t_count / $userdata['user_posts']) * 100 : 0;
} }
$l_active_pct = ($userdata['user_id'] != ANONYMOUS && $userdata['user_id'] == $user->data['user_id']) ? $user->lang['POST_PCT_ACTIVE_OWN'] : $user->lang['POST_PCT_ACTIVE'];
$template->assign_vars(array( $template->assign_vars(array(
'ACTIVE_FORUM' => $active_f_name, 'ACTIVE_FORUM' => $active_f_name,
'ACTIVE_FORUM_POSTS' => ($active_f_count == 1) ? sprintf($user->lang['USER_POST'], 1) : sprintf($user->lang['USER_POSTS'], $active_f_count), 'ACTIVE_FORUM_POSTS' => ($active_f_count == 1) ? sprintf($user->lang['USER_POST'], 1) : sprintf($user->lang['USER_POSTS'], $active_f_count),
'ACTIVE_FORUM_PCT' => sprintf($user->lang['POST_PCT_ACTIVE'], $active_f_pct), 'ACTIVE_FORUM_PCT' => sprintf($l_active_pct, $active_f_pct),
'ACTIVE_TOPIC' => censor_text($active_t_name), 'ACTIVE_TOPIC' => censor_text($active_t_name),
'ACTIVE_TOPIC_POSTS' => ($active_t_count == 1) ? sprintf($user->lang['USER_POST'], 1) : sprintf($user->lang['USER_POSTS'], $active_t_count), 'ACTIVE_TOPIC_POSTS' => ($active_t_count == 1) ? sprintf($user->lang['USER_POST'], 1) : sprintf($user->lang['USER_POSTS'], $active_t_count),
'ACTIVE_TOPIC_PCT' => sprintf($user->lang['POST_PCT_ACTIVE'], $active_t_pct), 'ACTIVE_TOPIC_PCT' => sprintf($l_active_pct, $active_t_pct),
'U_ACTIVE_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $active_f_id), 'U_ACTIVE_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $active_f_id),
'U_ACTIVE_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $active_t_id), 'U_ACTIVE_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $active_t_id),
'S_SHOW_ACTIVITY' => true) 'S_SHOW_ACTIVITY' => true)

2
phpBB/includes/functions_posting.php
View file

@ -338,7 +338,7 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
return $filedata; return $filedata;
} }
$extensions = $cache->obtain_attach_extensions($forum_id); $extensions = $cache->obtain_attach_extensions((($is_message) ? false : (int) $forum_id));
$upload->set_allowed_extensions(array_keys($extensions['_allowed_'])); $upload->set_allowed_extensions(array_keys($extensions['_allowed_']));
$file = ($local) ? $upload->local_upload($local_storage) : $upload->form_upload($form_name); $file = ($local) ? $upload->local_upload($local_storage) : $upload->form_upload($form_name);

2
phpBB/includes/functions_privmsgs.php
View file

@ -831,7 +831,7 @@ function handle_mark_actions($user_id, $mark_action)
{ {
global $db, $user, $_POST, $phpbb_root_path, $phpEx; global $db, $user, $_POST, $phpbb_root_path, $phpEx;
$msg_ids = (isset($_POST['marked_msg_id'])) ? array_map('intval', $_POST['marked_msg_id']) : array(); $msg_ids = request_var('marked_msg_id', array(0));
$cur_folder_id = request_var('cur_folder_id', PRIVMSGS_NO_BOX); $cur_folder_id = request_var('cur_folder_id', PRIVMSGS_NO_BOX);
$confirm = (isset($_POST['confirm'])) ? true : false; $confirm = (isset($_POST['confirm'])) ? true : false;

29
phpBB/includes/functions_user.php
View file

@ -746,19 +746,6 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
$ip_1_counter++; $ip_1_counter++;
} }
} }
else if (preg_match('#^([\w\-_]\.?){2,}$#is', trim($ban_item)))
{
// hostname
$ip_ary = gethostbynamel(trim($ban_item));
foreach ($ip_ary as $ip)
{
if ($ip)
{
$banlist_ary[] = $ip;
}
}
}
else if (preg_match('#^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$#', trim($ban_item)) || preg_match('#^[a-f0-9:]+\*?$#i', trim($ban_item))) else if (preg_match('#^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$#', trim($ban_item)) || preg_match('#^[a-f0-9:]+\*?$#i', trim($ban_item)))
{ {
// Normal IP address // Normal IP address
@ -769,6 +756,22 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
// Ban all IPs // Ban all IPs
$banlist_ary[] = "*"; $banlist_ary[] = "*";
} }
else if (preg_match('#^([\w\-_]\.?){2,}$#is', trim($ban_item)))
{
// hostname
$ip_ary = gethostbynamel(trim($ban_item));
if (!empty($ip_ary))
{
foreach ($ip_ary as $ip)
{
if ($ip)
{
$banlist_ary[] = $ip;
}
}
}
}
else else
{ {
trigger_error('NO_IPS_DEFINED'); trigger_error('NO_IPS_DEFINED');

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

@ -27,7 +27,7 @@ class ucp_attachments
$delete = (isset($_POST['delete'])) ? true : false; $delete = (isset($_POST['delete'])) ? true : false;
$confirm = (isset($_POST['confirm'])) ? true : false; $confirm = (isset($_POST['confirm'])) ? true : false;
$delete_ids = isset($_REQUEST['attachment']) ? array_keys(array_map('intval', $_REQUEST['attachment'])) : array(); $delete_ids = request_var('attachment', array(0));
if ($delete && sizeof($delete_ids)) if ($delete && sizeof($delete_ids))
{ {

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

@ -193,8 +193,8 @@ class ucp_main
if ($unwatch) if ($unwatch)
{ {
$forums = (isset($_POST['f'])) ? array_map('intval', array_keys($_POST['f'])) : array(); $forums = array_keys(request_var('f', array(0 => 0)));
$topics = (isset($_POST['t'])) ? array_map('intval', array_keys($_POST['t'])) : array(); $topics = array_keys(request_var('t', array(0 => 0)));
if (sizeof($forums) || sizeof($topics)) if (sizeof($forums) || sizeof($topics))
{ {
@ -512,7 +512,7 @@ class ucp_main
if (isset($_POST['unbookmark'])) if (isset($_POST['unbookmark']))
{ {
$s_hidden_fields = array('unbookmark' => 1); $s_hidden_fields = array('unbookmark' => 1);
$topics = (isset($_POST['t'])) ? array_map('intval', array_keys($_POST['t'])) : array(); $topics = (isset($_POST['t'])) ? array_keys(request_var('t', array(0 => 0))) : array();
$url = $this->u_action; $url = $this->u_action;
if (!sizeof($topics)) if (!sizeof($topics))
@ -644,7 +644,7 @@ class ucp_main
if ($delete) if ($delete)
{ {
$drafts = (!empty($_POST['d'])) ? array_map('intval', array_keys($_POST['d'])) : array(); $drafts = array_keys(request_var('d', array(0 => 0)));
if (sizeof($drafts)) if (sizeof($drafts))
{ {

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

@ -218,7 +218,7 @@ class ucp_pm
// Move PM // Move PM
if ($move_pm) if ($move_pm)
{ {
$move_msg_ids = (isset($_POST['marked_msg_id'])) ? array_map('intval', $_POST['marked_msg_id']) : array(); $move_msg_ids = (isset($_POST['marked_msg_id'])) ? request_var('marked_msg_id', array(0)) : array();
$cur_folder_id = request_var('cur_folder_id', PRIVMSGS_NO_BOX); $cur_folder_id = request_var('cur_folder_id', PRIVMSGS_NO_BOX);
if (move_pm($user->data['user_id'], $user->data['message_limit'], $move_msg_ids, $dest_folder, $cur_folder_id)) if (move_pm($user->data['user_id'], $user->data['message_limit'], $move_msg_ids, $dest_folder, $cur_folder_id))

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

@ -605,7 +605,7 @@ function compose_pm($id, $mode, $action)
$update_count = array(); $update_count = array();
$attachment_data = $message_parser->attachment_data; $attachment_data = $message_parser->attachment_data;
parse_attachments(0, $preview_message, $attachment_data, $update_count, true); parse_attachments(false, $preview_message, $attachment_data, $update_count, true);
foreach ($attachment_data as $i => $attachment) foreach ($attachment_data as $i => $attachment)
{ {

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

@ -120,7 +120,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
if (!empty($attachments)) if (!empty($attachments))
{ {
$update_count = array(); $update_count = array();
parse_attachments(0, $message, $attachments, $update_count); parse_attachments(false, $message, $attachments, $update_count);
// Update the attachment download counts // Update the attachment download counts
if (sizeof($update_count)) if (sizeof($update_count))

9
phpBB/install/database_update.php
View file

@ -324,6 +324,7 @@ $database_update_info = array(
USERS_TABLE => array( USERS_TABLE => array(
'user_options' => array('UINT:11', 895), 'user_options' => array('UINT:11', 895),
), ),
),
// Remove the following keys // Remove the following keys
'drop_keys' => array( 'drop_keys' => array(
ZEBRA_TABLE => array( ZEBRA_TABLE => array(
@ -564,6 +565,10 @@ if (version_compare($current_version, '3.0.b4', '<='))
set_config('ldap_user', ''); set_config('ldap_user', '');
set_config('fulltext_native_common_thres', '20'); set_config('fulltext_native_common_thres', '20');
// Remove config variables
$sql = 'DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = 'send_encoding'";
_sql($sql, $errored, $error_ary);
$sql = 'SELECT user_colour $sql = 'SELECT user_colour
FROM ' . USERS_TABLE . ' FROM ' . USERS_TABLE . '
WHERE user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ') WHERE user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')
@ -607,6 +612,10 @@ if (version_compare($current_version, '3.0.b4', '<='))
$sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = 895 WHERE user_options = 893'; $sql = 'UPDATE ' . USERS_TABLE . ' SET user_options = 895 WHERE user_options = 893';
_sql($sql, $errored, $error_ary); _sql($sql, $errored, $error_ary);
$sql = 'UPDATE ' . MODULES_TABLE . " SET module_auth = 'acl_a_board'
WHERE module_class = 'acp' AND module_mode = 'version_check' AND module_auth = 'acl_a_'";
_sql($sql, $errored, $error_ary);
$no_updates = false; $no_updates = false;
} }

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

@ -185,7 +185,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_store_resul
INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_deny', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_deny', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_empty_referer', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_empty_referer', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_downloads', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_downloads', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('send_encoding', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_protocol', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_protocol', '');

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

@ -121,6 +121,7 @@ $lang = array_merge($lang, array(
'NO_UPLOAD_DIR' => 'The upload directory you specified does not exist.', 'NO_UPLOAD_DIR' => 'The upload directory you specified does not exist.',
'NO_WRITE_UPLOAD' => 'The upload directory you specified cannot be written to. Please alter the permissions to allow the webserver to write to it.', 'NO_WRITE_UPLOAD' => 'The upload directory you specified cannot be written to. Please alter the permissions to allow the webserver to write to it.',
'ONLY_ALLOWED_IN_PM' => 'Only allowed in private messages',
'ORDER_ALLOW_DENY' => 'Allow', 'ORDER_ALLOW_DENY' => 'Allow',
'ORDER_DENY_ALLOW' => 'Deny', 'ORDER_DENY_ALLOW' => 'Deny',

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

@ -315,8 +315,6 @@ $lang = array_merge($lang, array(
'RANKS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/ranks</samp>', 'RANKS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/ranks</samp>',
'SCRIPT_PATH' => 'Script path', 'SCRIPT_PATH' => 'Script path',
'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>', 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>',
'SEND_ENCODING' => 'Send encoding',
'SEND_ENCODING_EXPLAIN' => 'Send the file encoding from phpBB via HTTP overriding the webserver’s configuration',
'SERVER_NAME' => 'Domain name', 'SERVER_NAME' => 'Domain name',
'SERVER_NAME_EXPLAIN' => 'The domain name this board runs from (for example: <samp>www.foo.bar</samp>)', 'SERVER_NAME_EXPLAIN' => 'The domain name this board runs from (for example: <samp>www.foo.bar</samp>)',
'SERVER_PORT' => 'Server port', 'SERVER_PORT' => 'Server port',

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

@ -559,6 +559,10 @@ $lang = array_merge($lang, array(
'LOG_PRUNE_USER_DEL_DEL' => '<strong>Users pruned and posts deleted</strong><br />» %s', 'LOG_PRUNE_USER_DEL_DEL' => '<strong>Users pruned and posts deleted</strong><br />» %s',
'LOG_PRUNE_USER_DEL_ANON' => '<strong>Users pruned and posts retained</strong><br />» %s', 'LOG_PRUNE_USER_DEL_ANON' => '<strong>Users pruned and posts retained</strong><br />» %s',
'LOG_RANK_ADDED' => '<strong>Added new rank</strong><br />» %s',
'LOG_RANK_REMOVED' => '<strong>Removed rank</strong><br />» %s',
'LOG_RANK_UPDATED' => '<strong>Updated rank</strong><br />» %s',
'LOG_REASON_ADDED' => '<strong>Added report/denial reason</strong><br />» %s', 'LOG_REASON_ADDED' => '<strong>Added report/denial reason</strong><br />» %s',
'LOG_REASON_REMOVED' => '<strong>Removed report/denial reason</strong><br />» %s', 'LOG_REASON_REMOVED' => '<strong>Removed report/denial reason</strong><br />» %s',
'LOG_REASON_UPDATED' => '<strong>Updated report/denial reason</strong><br />» %s', 'LOG_REASON_UPDATED' => '<strong>Updated report/denial reason</strong><br />» %s',

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

@ -181,7 +181,7 @@ $lang = array_merge($lang, array(
// Admin Permissions // Admin Permissions
$lang = array_merge($lang, array( $lang = array_merge($lang, array(
'acl_a_board' => array('lang' => 'Can alter board settings', 'cat' => 'settings'), 'acl_a_board' => array('lang' => 'Can alter board settings/check for updates', 'cat' => 'settings'),
'acl_a_server' => array('lang' => 'Can alter server/communication settings', 'cat' => 'settings'), 'acl_a_server' => array('lang' => 'Can alter server/communication settings', 'cat' => 'settings'),
'acl_a_jabber' => array('lang' => 'Can alter Jabber settings', 'cat' => 'settings'), 'acl_a_jabber' => array('lang' => 'Can alter Jabber settings', 'cat' => 'settings'),
'acl_a_phpinfo' => array('lang' => 'Can view php settings', 'cat' => 'settings'), 'acl_a_phpinfo' => array('lang' => 'Can view php settings', 'cat' => 'settings'),

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

@ -381,7 +381,8 @@ $lang = array_merge($lang, array(
'POST_DETAILS' => 'Post details', 'POST_DETAILS' => 'Post details',
'POST_NEW_TOPIC' => 'Post new topic', 'POST_NEW_TOPIC' => 'Post new topic',
'POST_PCT' => '%.2f%% of all posts', 'POST_PCT' => '%.2f%% of all posts',
'POST_PCT_ACTIVE' => '%.2f%% of your posts', 'POST_PCT_ACTIVE' => '%.2f%% of user’s posts',
'POST_PCT_ACTIVE_OWN' => '%.2f%% of your posts',
'POST_REPORTED' => 'Click to view report', 'POST_REPORTED' => 'Click to view report',
'POST_SUBJECT' => 'Post subject', 'POST_SUBJECT' => 'Post subject',
'POST_TIME' => 'Post time', 'POST_TIME' => 'Post time',

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

@ -83,7 +83,7 @@
</tr> </tr>
<tr> <tr>
<td class="gen" align="right" valign="top" nowrap="nowrap">{L_ACTIVE_IN_TOPIC}: </td> <td class="gen" align="right" valign="top" nowrap="nowrap">{L_ACTIVE_IN_TOPIC}: </td>
<td><!-- IF ACTIVE_TOPIC_PCT neq 0 --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="gensmall">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td> <td><!-- IF ACTIVE_TOPIC_PCT neq 0 --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="genmed">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>
</tr> </tr>
<!-- ENDIF --> <!-- ENDIF -->
</table> </table>

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

@ -52,7 +52,7 @@
</tr> </tr>
<tr> <tr>
<td align="right" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_TOPIC}: </b></td> <td align="right" valign="top" nowrap="nowrap"><b class="genmed">{L_ACTIVE_IN_TOPIC}: </b></td>
<td><!-- IF ACTIVE_TOPIC_PCT neq 0 --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="gensmall">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td> <td><!-- IF ACTIVE_TOPIC_PCT neq 0 --><b><a class="gen" href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></b><br /><span class="genmed">[ {ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT} ]</span><!-- ELSE --><span class="gen">-</span><!-- ENDIF --></td>
</tr> </tr>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF WARNINGS --> <!-- IF WARNINGS -->

2
phpBB/styles/subSilver/theme/stylesheet.css
View file

@ -12,8 +12,6 @@
-------------------------------------------------------------- --------------------------------------------------------------
*/ */
/* Layout /* Layout
------------ */ ------------ */
* { * {

2
phpBB/viewtopic.php
View file

@ -480,7 +480,7 @@ $icons = $cache->obtain_icons();
$extensions = array(); $extensions = array();
if ($topic_data['topic_attachment']) if ($topic_data['topic_attachment'])
{ {
$extensions = $cache->obtain_attach_extensions(); $extensions = $cache->obtain_attach_extensions($forum_id);
} }
// Forum rules listing // Forum rules listing