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

- introduce new function build_url to easily build a valid url from the user->page object as well as optionally removing certain keys

Browse source 
- changed attachment config to utilize the config build methods
- cleaned up posting.php
- the submit/delete_post functions are now usable (functions_posting.php)
- adjusted header icons (transparency)
- a bunch of fixes for mssql
- bug fixes


git-svn-id: file:///svn/phpbb/trunk@5902 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-05-12 20:52:58 +00:00
parent 7dd067bf5a
commit a8d99f2228
48 changed files with 2015 additions and 1957 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/adm/index.php
View file

@ -172,11 +172,7 @@ function adm_page_footer($copyright_html = true)
}
}
$explain_url = $phpbb_root_path . str_replace('&', '&', $user->page['page']);
$explain_url = (strpos($explain_url, '?') !== false) ? str_replace('?', $SID . '&', $explain_url) : $explain_url . '?' . str_replace('?', '', $SID);
$explain_url .= ((strpos($explain_url, '?') === false) ? '?' : '&') . 'explain=1';
$debug_output .= ' | <a href="' . $explain_url . '">Explain</a>';
$debug_output .= ' | <a href="' . build_url() . '&amp;explain=1">Explain</a>';
}
}

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

@ -33,87 +33,29 @@
<!-- IF S_ATTACHMENT_SETTINGS -->
<form id="attachsettings" method="post" action="{U_ACTION}">
<fieldset>
<legend>{L_ACP_ATTACHMENT_SETTINGS}</legend>
<dl>
<dt><label for="allow_attachments">{L_ALLOW_ATTACHMENTS}:</label></dt>
<dd><input type="radio" id="allow_attachments" name="allow_attachments" value="1"<!-- IF ALLOW_ATTACHMENTS --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_attachments" value="0"<!-- IF not ALLOW_ATTACHMENTS --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd>
</dl>
<dl>
<dt><label for="allow_pm_attach">{L_ALLOW_PM_ATTACHMENTS}:</label></dt>
<dd><input type="radio" id="allow_pm_attach" name="allow_pm_attach" value="1"<!-- IF ALLOW_PM_ATTACH --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES}&nbsp;&nbsp;<input type="radio" name="allow_pm_attach" value="0"<!-- IF not ALLOW_PM_ATTACH --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd>
</dl>
<dl>
<dt><label for="upload_dir">{L_UPLOAD_DIR}:</label><br /><span>{L_UPLOAD_DIR_EXPLAIN}</span></dt>
<dd><input type="text" id="upload_dir" size="25" maxlength="100" name="upload_path" value="{UPLOAD_PATH}" /></dd>
</dl>
<dl>
<dt><label for="display_order">{L_DISPLAY_ORDER}:</label><br /><span>{L_DISPLAY_ORDER_EXPLAIN}</span></dt>
<dd><input type="radio" class="radio" id="display_order" name="display_order" value="0"<!-- IF not DISPLAY_ORDER --> checked="checked"<!-- ENDIF --> /> {L_DESCENDING} &nbsp; <input type="radio" name="display_order" value="1"<!-- IF DISPLAY_ORDER --> checked="checked"<!-- ENDIF --> class="radio" /> {L_ASCENDING}</dd>
</dl>
<dl>
<dt><label for="attach_quota">{L_ATTACH_QUOTA}:</label><br /><span>{L_ATTACH_QUOTA_EXPLAIN}</span></dt>
<dd><input type="text" id="attach_quota" size="8" maxlength="15" name="attachment_quota" value="{ATTACHMENT_QUOTA}" /> <select name="quota_size">{S_QUOTA_SIZE_OPTIONS}</select></dd>
</dl>
<dl>
<dt><label for="max_filesize">{L_ATTACH_MAX_FILESIZE}:</label><br /><span>{L_ATTACH_MAX_FILESIZE_EXPLAIN}</span></dt>
<dd><input type="text" id="max_filesize" size="8" maxlength="15" name="max_filesize" value="{MAX_FILESIZE}" /> <select name="size">{S_MAX_FILESIZE_OPTIONS}</select></dd>
</dl>
<dl>
<dt><label for="max_pm_filesize">{L_ATTACH_MAX_PM_FILESIZE}:</label><br /><span>{L_ATTACH_MAX_PM_FILESIZE_EXPLAIN}</span></dt>
<dd><input type="text" id="max_pm_filesize" size="8" maxlength="15" name="max_filesize_pm" value="{MAX_PM_FILESIZE}" /> <select name="pm_size">{S_MAX_PM_FILESIZE_OPTIONS}</select></dd>
</dl>
<dl>
<dt><label for="max_attachments">{L_MAX_ATTACHMENTS}:</label></dt>
<dd><input type="text" id="max_attachments" size="3" maxlength="3" name="max_attachments" value="{MAX_ATTACHMENTS}" /></dd>
</dl>
<dl>
<dt><label for="max_attachments_pm">{L_MAX_ATTACHMENTS_PM}:</label></dt>
<dd><input type="text" id="max_attachments_pm" size="3" maxlength="3" name="max_attachments_pm" value="{MAX_ATTACHMENTS_PM}" /></dd>
</dl>
<dl>
<dt><label for="secure_downloads">{L_SECURE_DOWNLOADS}:</label><br /><span>{L_SECURE_DOWNLOADS_EXPLAIN}</span></dt>
<dd><input type="radio" id="secure_downloads" name="secure_downloads" value="1"<!-- IF SECURE_DOWNLOADS --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES}&nbsp;&nbsp;<input type="radio" name="secure_downloads" value="0"<!-- IF not SECURE_DOWNLOADS --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd>
</dl>
<dl>
<dt><label for="allow_deny">{L_SECURE_ALLOW_DENY}:</label><br /><span>{L_SECURE_ALLOW_DENY_EXPLAIN}</span></dt>
<dd><input type="radio" id="allow_deny" name="secure_allow_deny" value="1"<!-- IF SECURE_ALLOW_DENY --> checked="checked"<!-- ENDIF --> class="radio" /> {L_ORDER_ALLOW_DENY}&nbsp;&nbsp;<input type="radio" name="secure_allow_deny" value="0"<!-- IF not SECURE_ALLOW_DENY --> checked="checked"<!-- ENDIF --> class="radio" /> {L_ORDER_DENY_ALLOW}</dd>
</dl>
<dl>
<dt><label for="referer">{L_SECURE_EMPTY_REFERER}:</label><br /><span>{L_SECURE_EMPTY_REFERER_EXPLAIN}</span></dt>
<dd><input type="radio" id="referer" name="secure_allow_empty_referer" value="1"<!-- IF ALLOW_EMPTY_REFERER --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES}&nbsp;&nbsp;<input type="radio" name="secure_allow_empty_referer" value="0"<!-- IF not ALLOW_EMPTY_REFERER --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd>
</dl>
</fieldset>
<fieldset>
<legend>{L_SETTINGS_CAT_IMAGES} [{L_ASSIGNED_GROUP}: {ASSIGNED_GROUPS}]</legend>
<dl>
<dt><label for="display_inlined">{L_DISPLAY_INLINED}:</label><br /><span>{L_DISPLAY_INLINED_EXPLAIN}</span></dt>
<dd><input type="radio" id="display_inlined" name="img_display_inlined" value="1"<!-- IF DISPLAY_INLINED --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES}&nbsp;&nbsp;<input type="radio" name="img_display_inlined" value="0"<!-- IF not DISPLAY_INLINED --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd>
</dl>
<!-- IF S_THUMBNAIL_SUPPORT -->
<dl>
<dt><label for="create_thumbnail">{L_CREATE_THUMBNAIL}:</label><br /><span>{L_CREATE_THUMBNAIL_EXPLAIN}</span></dt>
<dd><input type="radio" id="create_thumbnail" name="img_create_thumbnail" value="1"<!-- IF CREATE_THUMBNAIL --> checked="checked"<!-- ENDIF --> class="radio" /> {L_YES}&nbsp;&nbsp;<input type="radio" name="img_create_thumbnail" value="0"<!-- IF not CREATE_THUMBNAIL --> checked="checked"<!-- ENDIF --> class="radio" /> {L_NO}</dd>
</dl>
<dl>
<dt><label for="thumb_filesize">{L_MIN_THUMB_FILESIZE}:</label><br /><span>{L_MIN_THUMB_FILESIZE_EXPLAIN}</span></dt>
<dd><input type="text" id="thumb_filesize" size="7" maxlength="15" name="img_min_thumb_filesize" value="{MIN_THUMB_FILESIZE}" /> {L_BYTES}</dd>
</dl>
<!-- IF not S_THUMBNAIL_SUPPORT -->
<div class="errorbox">
<p>{L_NO_THUMBNAIL_SUPPORT}</p>
</div>
<!-- ENDIF -->
<form id="attachsettings" method="post" action="{U_ACTION}">
<!-- BEGIN options -->
<!-- IF options.S_LEGEND -->
<!-- IF not options.S_FIRST_ROW -->
</fieldset>
<!-- ENDIF -->
<fieldset>
<legend>{options.LEGEND}</legend>
<!-- ELSE -->
<dl>
<dt><label for="imagick_path">{L_IMAGICK_PATH}:</label><br /><span>{L_IMAGICK_PATH_EXPLAIN}</span></dt>
<dd><input type="text" id="imagick_path" size="20" maxlength="200" name="img_imagick" value="{IMG_IMAGICK}" />&nbsp;&nbsp;<span>[ <a href="{U_SEARCH_IMAGICK}">{L_SEARCH_IMAGICK}</a> ]</span></dd>
</dl>
<dl>
<dt><label for="image_size">{L_MAX_IMAGE_SIZE}:</label><br /><span>{L_MAX_IMAGE_SIZE_EXPLAIN}</span></dt>
<dd><input type="text" id="image_size" size="3" maxlength="4" name="img_max_width" value="{MAX_WIDTH}" /> px X <input type="text" size="3" maxlength="4" name="img_max_height" value="{MAX_HEIGHT}" /> px</dd>
</dl>
<dl>
<dt><label for="link_size">{L_IMAGE_LINK_SIZE}:</label><br /><span>{L_IMAGE_LINK_SIZE_EXPLAIN}</span></dt>
<dd><input type="text" id="link_size" size="3" maxlength="4" name="img_link_width" value="{LINK_WIDTH}" /> px X <input type="text" size="3" maxlength="4" name="img_link_height" value="{LINK_HEIGHT}" /> px</dd>
<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
<dd>{options.CONTENT}</dd>
</dl>
<!-- ENDIF -->
<!-- END options -->
</fieldset>
<fieldset class="submit-buttons">

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

@ -80,7 +80,7 @@ function trace(link)
<!-- IF S_INCLUDE_SWATCH -->
function swatch()
{
window.open('{UA_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636');
window.open('{UA_SWATCH}', '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636');
return false;
}
<!-- ENDIF -->

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

@ -14,6 +14,7 @@
class acp_attachments
{
var $u_action;
var $new_config;
function main($id, $mode)
{
@ -64,85 +65,6 @@ class acp_attachments
include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
$config_sizes = array('max_filesize' => 'size', 'attachment_quota' => 'quota_size', 'max_filesize_pm' => 'pm_size');
foreach ($config_sizes as $cfg_key => $var)
{
$$var = request_var($var, '');
}
// Pull all config data
$sql = 'SELECT *
FROM ' . CONFIG_TABLE;
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
$config_name = $row['config_name'];
$config_value = $row['config_value'];
$default_config[$config_name] = $config_value;
$new[$config_name] = request_var($config_name, $default_config[$config_name]);
foreach ($config_sizes as $cfg_key => $var)
{
if (empty($$var) && !$submit && $config_name == $cfg_key)
{
$$var = (intval($default_config[$config_name]) >= 1048576) ? 'mb' : ((intval($default_config[$config_name]) >= 1024) ? 'kb' : 'b');
}
if (!$submit && $config_name == $cfg_key)
{
$new[$config_name] = ($new[$config_name] >= 1048576) ? round($new[$config_name] / 1048576 * 100) / 100 : (($new[$config_name] >= 1024) ? round($new[$config_name] / 1024 * 100) / 100 : $new[$config_name]);
}
if ($submit && $config_name == $cfg_key)
{
$old = $new[$config_name];
$new[$config_name] = ($$var == 'kb') ? round($new[$config_name] * 1024) : (($$var == 'mb') ? round($new[$config_name] * 1048576) : $new[$config_name]);
}
}
if ($submit)
{
set_config($config_name, $new[$config_name]);
if (in_array($config_name, array('max_filesize', 'attachment_quota', 'max_filesize_pm')))
{
$new[$config_name] = $old;
}
}
}
$db->sql_freeresult($result);
$this->perform_site_list();
if ($submit)
{
add_log('admin', 'LOG_CONFIG_ATTACH');
// Check Settings
$this->test_upload($error, $new['upload_path'], false);
if (!sizeof($error))
{
trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
}
}
$template->assign_var('S_ATTACHMENT_SETTINGS', true);
if ($action == 'imgmagick')
{
$new['img_imagick'] = $this->search_imagemagick();
}
// We strip eventually manual added convert program, we only want the patch
$new['img_imagick'] = str_replace(array('convert', '.exe'), array('', ''), $new['img_imagick']);
$s_size_options = size_select_options($size);
$s_quota_size_options = size_select_options($quota_size);
$s_pm_size_options = size_select_options($pm_size);
$sql = 'SELECT group_name, cat_id
FROM ' . EXTENSION_GROUPS_TABLE . '
WHERE cat_id > 0
@ -156,48 +78,103 @@ class acp_attachments
}
$db->sql_freeresult($result);
$l_legend_cat_images = $user->lang['SETTINGS_CAT_IMAGES'] . ' [' . $user->lang['ASSIGNED_GROUP'] . ': ' . ((sizeof($s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE])) ? implode(', ', $s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE]) : $user->lang['NONE']) . ']';
$display_vars = array(
'title' => 'ACP_ATTACHMENT_SETTINGS',
'vars' => array(
'img_max_width' => false, 'img_max_height' => false, 'img_link_width' => false, 'img_link_height' => false,
'legend1' => 'ACP_ATTACHMENT_SETTINGS',
'allow_attachments' => array('lang' => 'ALLOW_ATTACHMENTS', 'type' => 'radio:yes_no', 'explain' => false),
'allow_pm_attach' => array('lang' => 'ALLOW_PM_ATTACHMENTS', 'type' => 'radio:yes_no', 'explain' => false),
'upload_path' => array('lang' => 'UPLOAD_DIR', 'type' => 'text:25:100', 'explain' => true),
'display_order' => array('lang' => 'DISPLAY_ORDER', 'type' => 'custom', 'method' => 'display_order', 'explain' => true),
'attachment_quota' => array('lang' => 'ATTACH_QUOTA', 'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
'max_filesize' => array('lang' => 'ATTACH_MAX_FILESIZE', 'type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
'max_filesize_pm' => array('lang' => 'ATTACH_MAX_PM_FILESIZE','type' => 'custom', 'method' => 'max_filesize', 'explain' => true),
'max_attachments' => array('lang' => 'MAX_ATTACHMENTS', 'type' => 'text:3:3', 'explain' => false),
'max_attachments_pm' => array('lang' => 'MAX_ATTACHMENTS_PM', 'type' => 'text:3:3', 'explain' => false),
'secure_downloads' => array('lang' => 'SECURE_DOWNLOADS', 'type' => 'radio:yes_no', 'explain' => true),
'secure_allow_deny' => array('lang' => 'SECURE_ALLOW_DENY', 'type' => 'custom', 'method' => 'select_allow_deny', 'explain' => true),
'secure_allow_empty_referer' => array('lang' => 'SECURE_EMPTY_REFERER', 'type' => 'radio:yes_no', 'explain' => true),
'legend2' => $l_legend_cat_images,
'img_display_inlined' => array('lang' => 'DISPLAY_INLINED', 'type' => 'radio:yes_no', 'explain' => true),
'img_create_thumbnail' => array('lang' => 'CREATE_THUMBNAIL', 'type' => 'radio:yes_no', 'explain' => true),
'img_min_thumb_filesize' => array('lang' => 'MIN_THUMB_FILESIZE', 'type' => 'text:7:15', 'explain' => true, 'append' => ' ' . $user->lang['BYTES']),
'img_imagick' => array('lang' => 'IMAGICK_PATH', 'type' => 'text:20:200', 'explain' => true, 'append' => '&nbsp;&nbsp;<span>[ <a href="' . $this->u_action . '&amp;action=imgmagick">' . $user->lang['SEARCH_IMAGICK'] . '</a> ]</span>'),
'img_max' => array('lang' => 'MAX_IMAGE_SIZE', 'type' => 'dimension:3:4', 'explain' => true),
'img_link' => array('lang' => 'IMAGE_LINK_SIZE', 'type' => 'dimension:3:4', 'explain' => true),
)
);
$this->new_config = $config;
$cfg_array = (isset($_REQUEST['config'])) ? request_var('config', array('' => '')) : $this->new_config;
// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
foreach ($display_vars['vars'] as $config_name => $null)
{
if (!isset($cfg_array[$config_name]) || strpos($config_name, 'legend') !== false)
{
continue;
}
$this->new_config[$config_name] = $config_value = $cfg_array[$config_name];
if ($config_name == 'attachment_quota')
{
$size_var = request_var($config_name, '');
$this->new_config[$config_name] = $config_value = ($size_var == 'kb') ? round($config_value * 1024) : (($size_var == 'mb') ? round($config_value * 1048576) : $config_value);
}
if ($submit)
{
set_config($config_name, $config_value);
}
}
$this->perform_site_list();
if ($submit)
{
add_log('admin', 'LOG_CONFIG_ATTACH');
// Check Settings
$this->test_upload($error, $this->new_config['upload_path'], false);
if (!sizeof($error))
{
trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
}
}
$template->assign_var('S_ATTACHMENT_SETTINGS', true);
if ($action == 'imgmagick')
{
$this->new_config['img_imagick'] = $this->search_imagemagick();
}
// We strip eventually manual added convert program, we only want the patch
$this->new_config['img_imagick'] = str_replace(array('convert', '.exe'), array('', ''), $this->new_config['img_imagick']);
$supported_types = get_supported_image_types();
// Check Thumbnail Support
if (!$new['img_imagick'] && (!isset($supported_types['format']) || !sizeof($supported_types['format'])))
if (!$this->new_config['img_imagick'] && (!isset($supported_types['format']) || !sizeof($supported_types['format'])))
{
$new['img_create_thumbnail'] = '0';
$this->new_config['img_create_thumbnail'] = 0;
}
$template->assign_vars(array(
'UPLOAD_PATH' => $new['upload_path'],
'DISPLAY_ORDER' => $new['display_order'],
'ATTACHMENT_QUOTA' => $new['attachment_quota'],
'ALLOW_ATTACHMENTS' => $new['allow_attachments'],
'ALLOW_PM_ATTACH' => $new['allow_pm_attach'],
'MAX_FILESIZE' => $new['max_filesize'],
'MAX_PM_FILESIZE' => $new['max_filesize_pm'],
'MAX_ATTACHMENTS' => $new['max_attachments'],
'MAX_ATTACHMENTS_PM' => $new['max_attachments_pm'],
'SECURE_DOWNLOADS' => $new['secure_downloads'],
'SECURE_ALLOW_DENY' => $new['secure_allow_deny'],
'ALLOW_EMPTY_REFERER' => $new['secure_allow_empty_referer'],
'ASSIGNED_GROUPS' => (sizeof($s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE])) ? implode(', ', $s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE]) : $user->lang['NONE'],
'DISPLAY_INLINED' => $new['img_display_inlined'],
'CREATE_THUMBNAIL' => $new['img_create_thumbnail'],
'MIN_THUMB_FILESIZE' => $new['img_min_thumb_filesize'],
'IMG_IMAGICK' => $new['img_imagick'],
'MAX_WIDTH' => $new['img_max_width'],
'MAX_HEIGHT' => $new['img_max_height'],
'LINK_WIDTH' => $new['img_link_width'],
'LINK_HEIGHT' => $new['img_link_height'],
'U_SEARCH_IMAGICK' => $this->u_action . '&amp;action=imgmagick',
'S_QUOTA_SIZE_OPTIONS' => $s_quota_size_options,
'S_MAX_FILESIZE_OPTIONS' => $s_size_options,
'S_MAX_PM_FILESIZE_OPTIONS' => $s_pm_size_options,
'S_THUMBNAIL_SUPPORT' => (!$new['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
$allow_deny = ($new['secure_allow_deny']) ? 'ALLOWED' : 'DISALLOWED';
$allow_deny = ($this->new_config['secure_allow_deny']) ? 'ALLOWED' : 'DISALLOWED';
$sql = 'SELECT *
FROM ' . SITELIST_TABLE;
@ -218,7 +195,7 @@ class acp_attachments
$db->sql_freeresult($result);
$template->assign_vars(array(
'S_SECURE_DOWNLOADS' => $new['secure_downloads'],
'S_SECURE_DOWNLOADS' => $this->new_config['secure_downloads'],
'S_DEFINED_IPS' => ($defined_ips != '') ? true : false,
'DEFINED_IPS' => $defined_ips,
@ -229,6 +206,48 @@ class acp_attachments
)
);
// Output relevant options
foreach ($display_vars['vars'] as $config_key => $vars)
{
if (!is_array($vars) && strpos($config_key, 'legend') === false)
{
continue;
}
if (strpos($config_key, 'legend') !== false)
{
$template->assign_block_vars('options', array(
'S_LEGEND' => true,
'LEGEND' => (isset($user->lang[$vars])) ? $user->lang[$vars] : $vars)
);
continue;
}
$type = explode(':', $vars['type']);
$l_explain = '';
if ($vars['explain'] && isset($vars['lang_explain']))
{
$l_explain = (isset($user->lang[$vars['lang_explain']])) ? $user->lang[$vars['lang_explain']] : $vars['lang_explain'];
}
else if ($vars['explain'])
{
$l_explain = (isset($user->lang[$vars['lang'] . '_EXPLAIN'])) ? $user->lang[$vars['lang'] . '_EXPLAIN'] : '';
}
$template->assign_block_vars('options', array(
'KEY' => $config_key,
'TITLE' => $user->lang[$vars['lang']],
'S_EXPLAIN' => $vars['explain'],
'TITLE_EXPLAIN' => $l_explain,
'CONTENT' => build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars),
)
);
unset($display_vars['vars'][$config_key]);
}
break;
case 'extensions':
@ -1410,6 +1429,38 @@ class acp_attachments
$cache->put('_extensions', $extensions);
}
/**
* Write display_order config field
*/
function display_order($value, $key = '')
{
$radio_ary = array(0 => 'DESCENDING', 1 => 'ASCENDING');
return h_radio('config[display_order]', $radio_ary, $value, $key);
}
/**
* Adjust all three max_filesize config vars for display
*/
function max_filesize($value, $key = '')
{
// Determine size var and adjust the value accordingly
$size_var = ($value >= 1048576) ? 'mb' : (($value >= 1024) ? 'kb' : 'b');
$value = ($value >= 1048576) ? round($value / 1048576 * 100) / 100 : (($value >= 1024) ? round($value / 1024 * 100) / 100 : $value);
return '<input type="text" id="' . $key . '" size="8" maxlength="15" name="config[' . $key . ']" value="' . $value . '" /> <select name="' . $key . '">' . size_select_options($size_var) . '</select>';
}
/**
* Write secure_allow_deny config field
*/
function select_allow_deny($value, $key = '')
{
$radio_ary = array(1 => 'ORDER_ALLOW_DENY', 0 => 'ORDER_DENY_ALLOW');
return h_radio('config[' . $key . ']', $radio_ary, $value, $key);
}
}
?>

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

@ -369,13 +369,13 @@ class acp_board
continue;
}
$config_value = $cfg_array[$config_name];
$this->new_config[$config_name] = $config_value;
$this->new_config[$config_name] = $config_value = $cfg_array[$config_name];
if ($config_name == 'email_function_name')
{
$this->new_config['email_function_name'] = trim(str_replace(array('(', ')'), array('', ''), $this->new_config['email_function_name']));
$this->new_config['email_function_name'] = (empty($this->new_config['email_function_name']) || !function_exists($this->new_config['email_function_name'])) ? 'mail' : $this->new_config['email_function_name'];
$config_value = $this->new_config['email_function_name'];
}
if ($submit)
@ -499,7 +499,7 @@ class acp_board
{
$template->assign_block_vars('options', array(
'S_LEGEND' => true,
'LEGEND' => $user->lang[$vars])
'LEGEND' => (isset($user->lang[$vars])) ? $user->lang[$vars] : $vars)
);
continue;
@ -507,11 +507,21 @@ class acp_board
$type = explode(':', $vars['type']);
$l_explain = '';
if ($vars['explain'] && isset($vars['lang_explain']))
{
$l_explain = (isset($user->lang[$vars['lang_explain']])) ? $user->lang[$vars['lang_explain']] : $vars['lang_explain'];
}
else if ($vars['explain'])
{
$l_explain = (isset($user->lang[$vars['lang'] . '_EXPLAIN'])) ? $user->lang[$vars['lang'] . '_EXPLAIN'] : '';
}
$template->assign_block_vars('options', array(
'KEY' => $config_key,
'TITLE' => $user->lang[$vars['lang']],
'TITLE' => (isset($user->lang[$vars['lang']])) ? $user->lang[$vars['lang']] : $vars['lang'],
'S_EXPLAIN' => $vars['explain'],
'TITLE_EXPLAIN' => ($vars['explain']) ? $user->lang[$vars['lang'] . '_EXPLAIN'] : '',
'TITLE_EXPLAIN' => $l_explain,
'CONTENT' => build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars),
)
);
@ -591,7 +601,7 @@ class acp_board
{
global $user;
return '<option value="1"' . (($value == 1) ? ' selected="selected"' : '') . '>' . $user->lang['DELETE_OLDEST_MESSAGES'] . '</option><option value="2"' . (($value == 2) ? ' selected="selected"' : '') . '>' . $user->lang['HOLD_NEW_MESSAGES'] . '</option>';
return '<option value="1"' . (($value == 1) ? ' selected="selected"' : '') . '>' . $user->lang['DELETE_OLDEST_MESSAGES'] . '</option><option value="2"' . (($value == 2) ? ' selected="selected"' : '') . '>' . $user->lang['HOLD_NEW_MESSAGES_SHORT'] . '</option>';
}
function captcha_pixel_noise_select($value, $key = '')

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

@ -384,7 +384,7 @@ class acp_permissions
'FROM' => array(
GROUPS_TABLE => 'g',
ACL_OPTIONS_TABLE => 'o',
ACL_USERS_TABLE => 'a'
ACL_GROUPS_TABLE => 'a'
),
'LEFT_JOIN' => array(

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

@ -31,6 +31,9 @@ class acp_styles
global $db, $user, $auth, $template;
global $config, $SID, $phpbb_root_path, $phpbb_admin_path, $phpEx;
// Hardcoded template bitfield to add for new templates
define('TEMPLATE_BITFIELD', 6921);
$user->add_lang('acp/styles');
$this->tpl_name = 'acp_styles';
@ -2216,7 +2219,9 @@ pagination_sep = \'{PAGINATION_SEP}\'
switch ($mode)
{
case 'template':
// We set a pre-defined bitfield here which we may use further in 3.2
$sql_ary += array(
'bbcode_bitfield' => TEMPLATE_BITFIELD,
$mode . '_storedb' => (!is_writeable("{$phpbb_root_path}styles/$path/$mode")) ? 1 : 0
);
break;

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

@ -951,9 +951,16 @@ class acp_users
}
if (!isset($data['bday_day']))
{
if ($user_row['user_birthday'])
{
list($data['bday_day'], $data['bday_month'], $data['bday_year']) = explode('-', $user_row['user_birthday']);
}
else
{
$data['bday_day'] = $data['bday_month'] = $data['bday_year'] = 0;
}
}
$s_birthday_day_options = '<option value="0"' . ((!$data['bday_day']) ? ' selected="selected"' : '') . '>--</option>';
for ($i = 1; $i < 32; $i++)

17
phpBB/includes/captcha/captcha_gd.php
View file

@ -14,6 +14,21 @@
* Main gd based captcha class
*
* Thanks to Robert Hetzler (Xore)
*
* @todo see notes in includes/captcha/captcha_gd.php
*
* Within the policy 'policy_occlude' the letters need to have more space in-between of them.
* At the moment it can happen that the letters get overlapped
*
* Completely remove the number 0
* Make it case-insensitive
*
* The policy_entropy seems to be the best readable, then follows policy_occlude and policy_3dbitmap not readable.
*
* Within the policy 'policy_3dbitmap':
* The 2 and the Z seem to be very similar
* The letters are not distinguishable(?) enough from the background, maybe related to the letters itself
* The colors are generally a bit off making it hard to read...
*/
class captcha
{
@ -24,7 +39,7 @@ class captcha
{
global $config;
$policy_modules = array('policy_occlude', 'policy_entropy', 'policy_3dbitmap');
$policy_modules = array('policy_entropy', 'policy_occlude'); // 'policy_3dbitmap'
// Remove all disabled policy modules
foreach ($policy_modules as $key => $name)

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

@ -266,7 +266,9 @@ class dbal
$message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . $error['message'] . ' [' . $error['code'] . ']';
// Show complete SQL error and path to administrators only
if ($auth->acl_get('a_') || defined('IN_INSTALL'))
// Additionally show complete error on installation or if extended debug mode is enabled
// The DEBUG_EXTRA constant is for development only!
if ($auth->acl_get('a_') || defined('IN_INSTALL') || defined('DEBUG_EXTRA'))
{
// Print out a nice backtrace...
$backtrace = get_backtrace();
@ -314,7 +316,7 @@ class dbal
*/
function sql_report($mode, $query = '')
{
global $cache, $starttime, $phpbb_root_path, $user;
global $cache, $starttime, $phpbb_root_path, $user, $SID;
if (empty($_GET['explain']))
{
@ -350,7 +352,7 @@ class dbal
<body id="errorpage">
<div id="wrap">
<div id="page-header">
<a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '">Return to previous page</a>
<a href="' . build_url('explain') . '">Return to previous page</a>
</div>
<div id="page-body">
<div class="panel">

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

@ -98,7 +98,6 @@ class dbal_mssql extends dbal
{
global $cache;
// EXPLAIN only in extra debug mode
if (defined('DEBUG_EXTRA'))
{
@ -315,17 +314,33 @@ class dbal_mssql extends dbal
*/
function _sql_error()
{
$error = array(
'message' => @mssql_get_last_message($this->db_connect_id),
'code' => ''
);
$result_id = @mssql_query('SELECT @@ERROR as errno', $this->db_connect_id);
// Get error code number
$result_id = @mssql_query('SELECT @@ERROR as code', $this->db_connect_id);
if ($result_id)
{
$row = @mssql_fetch_assoc($result_id);
$error['code'] = $row['errno'];
$error['code'] = $row['code'];
@mssql_free_result($result_id);
}
// Get full error message if possible
$sql = 'SELECT CAST(description as varchar(255)) as message
FROM master.dbo.sysmessages
WHERE error = ' . $error['code'];
$result_id = @mssql_query($sql);
if ($result_id)
{
$row = @mssql_fetch_assoc($result_id);
if (!empty($row['message']))
{
$error['message'] .= '<br />' . $row['message'];
}
@mssql_free_result($result_id);
}

66
phpBB/includes/functions.php
View file

@ -1228,6 +1228,36 @@ function redirect($url)
exit;
}
/**
* Returns url from the session/current page with an re-appended SID with optionally stripping vars from the url
*/
function build_url($strip_vars = false)
{
global $user, $phpbb_root_path, $SID;
// Append SID
$redirect = (($user->page['page_dir']) ? $user->page['page_dir'] . '/' : '') . $user->page['page_name'] . $SID . (($user->page['query_string']) ? "&{$user->page['query_string']}" : '');
// Strip vars...
if ($strip_vars !== false)
{
if (!is_array($strip_vars))
{
$strip_vars = array($strip_vars);
}
foreach ($strip_vars as $var)
{
if (strpos($redirect, $var) !== false)
{
$redirect = preg_replace('#^(.*?)&?' . preg_quote($var, '#') . '=.*(&?)(.*?)$#', '\1\3', $redirect);
}
}
}
return $phpbb_root_path . str_replace('&', '&amp;', $redirect);
}
/**
* Meta refresh assignment
*/
@ -1427,7 +1457,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
// Remove previously added sid (should not happen)
if (strpos($redirect, '?sid='))
{
$redirect = preg_replace('/\?sid=[a-z0-9]+(&|&amp;)?/', $SID . '\1', $redirect);
$redirect = preg_replace('/\?sid=[a-z0-9]+(&amp;|&)?/', $SID . '\1', $redirect);
}
else
{
@ -1495,7 +1525,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
if (!$redirect)
{
// We just use what the session code determined...
$redirect = htmlspecialchars($user->page['page_name'] . (($user->page['query_string']) ? '?' . $user->page['query_string'] : ''));
$redirect = $user->page['page_name'] . (($user->page['query_string']) ? '?' . $user->page['query_string'] : '');
}
$s_hidden_fields = build_hidden_fields(array('redirect' => $redirect, 'sid' => $user->session_id));
@ -1530,7 +1560,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
/**
* Generate forum login box
*/
function login_forum_box(&$forum_data)
function login_forum_box($forum_data)
{
global $db, $config, $user, $template, $phpEx;
@ -1540,15 +1570,15 @@ function login_forum_box(&$forum_data)
FROM ' . FORUMS_ACCESS_TABLE . '
WHERE forum_id = ' . $forum_data['forum_id'] . '
AND user_id = ' . $user->data['user_id'] . "
AND session_id = '$user->session_id'";
AND session_id = '" . $db->sql_escape($user->session_id) . "'";
$result = $db->sql_query($sql);
if ($row = $db->sql_fetchrow($result))
{
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
if ($row)
{
return true;
}
$db->sql_freeresult($result);
if ($password)
{
@ -1575,9 +1605,13 @@ function login_forum_box(&$forum_data)
if ($password == $forum_data['forum_password'])
{
$sql = 'INSERT INTO ' . FORUMS_ACCESS_TABLE . ' (forum_id, user_id, session_id)
VALUES (' . $forum_data['forum_id'] . ', ' . $user->data['user_id'] . ", '" . $db->sql_escape($user->session_id) . "')";
$db->sql_query($sql);
$sql_ary = array(
'forum_id' => (int) $forum_data['forum_id'],
'user_id' => (int) $user->data['user_id'],
'session_id' => (string) $user->session_id,
);
$db->sql_query('INSERT INTO ' . FORUMS_ACCESS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
return true;
}
@ -1586,9 +1620,11 @@ function login_forum_box(&$forum_data)
}
page_header();
$template->set_filenames(array(
'body' => 'login_forum.html')
);
page_footer();
}
@ -2525,7 +2561,7 @@ function page_header($page_title = '')
'SITENAME' => $config['sitename'],
'SITE_DESCRIPTION' => $config['site_desc'],
'PAGE_TITLE' => $page_title,
'SCRIPT_NAME' => str_replace($phpEx, '', $user->page['page_name']),
'SCRIPT_NAME' => str_replace('.' . $phpEx, '', $user->page['page_name']),
'LAST_VISIT_DATE' => sprintf($user->lang['YOU_LAST_VISIT'], $s_last_visit),
'CURRENT_TIME' => sprintf($user->lang['CURRENT_TIME'], $user->format_date(time(), false, true)),
'TOTAL_USERS_ONLINE' => $l_online_users,
@ -2640,11 +2676,7 @@ function page_footer()
}
}
$explain_url = $phpbb_root_path . str_replace('&', '&amp;', $user->page['page']);
$explain_url = (strpos($explain_url, '?') !== false) ? str_replace('?', $SID . '&amp;', $explain_url) : $explain_url . '?' . str_replace('?', '', $SID);
$explain_url .= ((strpos($explain_url, '?') === false) ? '?' : '&amp;') . 'explain=1';
$debug_output .= ' | <a href="' . $explain_url . '">Explain</a>';
$debug_output .= ' | <a href="' . build_url() . '&amp;explain=1">Explain</a>';
}
}

4
phpBB/includes/functions_display.php
View file

@ -193,7 +193,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
// Handle marking posts
if ($mark_read == 'forums' || $mark_read == 'all')
{
$redirect = (!empty($_SERVER['REQUEST_URI'])) ? preg_replace('#^(.*?)&(amp;)?mark=.*$#', '\1', htmlspecialchars($_SERVER['REQUEST_URI'])) : "index.$phpEx$SID";
$redirect = build_url('mark');
if ($mark_read == 'all')
{
@ -332,7 +332,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
'FORUM_DESC' => generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield']),
'TOPICS' => $row['forum_topics'],
$l_post_click_count => $post_click_count,
'FORUM_FOLDER_IMG' => ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang['folder_alt'] . '" />' : $user->img($folder_image, $folder_alt),
'FORUM_FOLDER_IMG' => ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $folder_alt . '" />' : $user->img($folder_image, $folder_alt),
'FORUM_FOLDER_IMG_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : $user->img($folder_image, $folder_alt, false, '', 'src'),
'SUBFORUMS' => $subforums_list,
'LAST_POST_TIME' => $last_post_time,

1018
phpBB/includes/functions_posting.php
View file

File diff suppressed because it is too large Load diff

2
phpBB/includes/functions_privmsgs.php
View file

@ -1382,7 +1382,7 @@ function submit_pm($mode, $subject, &$data, $update_message, $put_in_outbox = tr
// Send Notifications
if ($mode != 'edit')
{
pm_notification($mode, stripslashes($data['from_username']), $recipients, stripslashes($subject), stripslashes($data['message']));
pm_notification($mode, $data['from_username'], $recipients, $subject, $data['message']);
}
return $data['msg_id'];

15
phpBB/includes/functions_user.php
View file

@ -139,6 +139,7 @@ function user_delete($mode, $user_id, $post_username = false)
GROUP BY topic_id";
$result = $db->sql_query($sql);
$topic_id_ary = array();
while ($row = $db->sql_fetchrow($result))
{
$topic_id_ary[$row['topic_id']] = $row['total_posts'];
@ -199,7 +200,7 @@ function user_delete($mode, $user_id, $post_username = false)
set_config('newest_user_id', $row['user_id']);
set_config('newest_username', $row['username']);
}
$db->freeresult($result);
$db->sql_freeresult($result);
}
set_config('num_users', $config['num_users'] - 1, true);
@ -1226,6 +1227,12 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
{
if (isset($group_attributes[$attribute]) && !in_array($attribute, $group_only_ary))
{
// If we are about to set an avatar, we will not overwrite user avatars if no group avatar is set...
if (strpos($attribute, 'group_avatar') === 0 && !$group_attributes[$attribute])
{
continue;
}
$sql_ary[str_replace('group', 'user', $attribute)] = $group_attributes[$attribute];
}
}
@ -1618,6 +1625,12 @@ function group_set_user_default($group_id, $user_id_ary, $group_attributes = fal
{
if (isset($group_attributes[$attribute]))
{
// If we are about to set an avatar, we will not overwrite user avatars if no group avatar is set...
if (strpos($attribute, 'group_avatar') === 0 && !$group_attributes[$attribute])
{
continue;
}
settype($group_attributes[$attribute], $type);
$sql_ary[str_replace('group_', 'user_', $attribute)] = $group_attributes[$attribute];
}

2
phpBB/includes/mcp/mcp_queue.php
View file

@ -676,7 +676,7 @@ function disapprove_post($post_id_list, $mode)
'EMAIL_SIG' => $email_sig,
'SITENAME' => $config['sitename'],
'USERNAME' => $post_data['username'],
'REASON' => stripslashes($disapprove_reason),
'REASON' => $disapprove_reason,
'POST_SUBJECT' => censor_text($post_data['post_subject']),
'TOPIC_TITLE' => censor_text($post_data['topic_title']))
);

34
phpBB/includes/message_parser.php
View file

@ -148,6 +148,8 @@ class bbcode_firstpass extends bbcode
function check_bbcode($bbcode, &$in)
{
// when using the /e modifier, preg_replace slashes double-quotes but does not
// seem to slash anything else
$in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in)));
if (!$in)
@ -266,17 +268,11 @@ class bbcode_firstpass extends bbcode
// Expects the argument to start right after the opening [code] tag and to end with [/code]
function bbcode_code($stx, $in)
{
// when using the /e modifier, preg_replace slashes double-quotes but does not
// seem to slash anything else
$in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in)));
if (!$in)
if (!$this->check_bbcode('code', $in))
{
return '';
}
$this->parsed_items['code']++;
// We remove the hardcoded elements from the code block here because it is not used in code blocks
// Having it here saves us one preg_replace per message containing [code] blocks
// Additionally, magic url parsing should go after parsing bbcodes, but for safety those are stripped out too...
@ -399,7 +395,6 @@ class bbcode_firstpass extends bbcode
return '';
}
$in = str_replace('\"', '"', $in);
$out = '[';
// Grab item_start with no item_end
@ -489,7 +484,7 @@ class bbcode_firstpass extends bbcode
{
global $config, $user;
$in = trim($in);
$in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in)));
if (!$in)
{
@ -503,7 +498,9 @@ class bbcode_firstpass extends bbcode
$in = preg_replace(array('#\[quote(=&quot;.*?&quot;)?\]([^\n])#is', '#([^\n])\[\/quote\]#is'), array("[quote\\1]\n\\2", "\\1\n[/quote]"), $in);
$in = preg_replace(array('#\[quote(=&quot;.*?&quot;)?\]([^\n])#is', '#([^\n])\[\/quote\]#is'), array("[quote\\1]\n\\2", "\\1\n[/quote]"), $in);
$in = substr(str_replace('\"', '"', $in), 1);
$in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in)));
$in = substr($in, 1);
$close_tags = $error_ary = array();
$buffer = '';
@ -629,8 +626,11 @@ class bbcode_firstpass extends bbcode
function validate_email($var1, $var2)
{
$txt = stripslashes($var2);
$email = ($var1) ? stripslashes($var1) : stripslashes($var2);
$var1 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var1)));
$var2 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var2)));
$txt = $var2;
$email = ($var1) ? $var1 : $var2;
$validated = true;
@ -662,10 +662,10 @@ class bbcode_firstpass extends bbcode
{
global $config;
$var1 = trim($var1);
$var2 = trim($var2);
$var1 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var1)));
$var2 = str_replace("\r\n", "\n", str_replace('\"', '"', trim($var2)));
$url = ($var1) ? stripslashes($var1) : stripslashes($var2);
$url = ($var1) ? $var1 : $var2;
$valid = false;
if (!$url || ($var1 && !$var2))
@ -690,10 +690,10 @@ class bbcode_firstpass extends bbcode
$url = 'http://' . $url;
}
return ($var1) ? '[url=' . str_replace(array(']', '['), array('&#93;', '&#91;'), $url) . ':' . $this->bbcode_uid . ']' . stripslashes($var2) . '[/url:' . $this->bbcode_uid . ']' : '[url:' . $this->bbcode_uid . ']' . $url . '[/url:' . $this->bbcode_uid . ']';
return ($var1) ? '[url=' . str_replace(array(']', '['), array('&#93;', '&#91;'), $url) . ':' . $this->bbcode_uid . ']' . $var2 . '[/url:' . $this->bbcode_uid . ']' : '[url:' . $this->bbcode_uid . ']' . $url . '[/url:' . $this->bbcode_uid . ']';
}
return '[url' . (($var1) ? '=' . stripslashes($var1) : '') . ']' . stripslashes($var2) . '[/url]';
return '[url' . (($var1) ? '=' . $var1 : '') . ']' . $var2 . '[/url]';
}
}

16
phpBB/includes/session.php
View file

@ -139,6 +139,7 @@ class session
// Why no forwarded_for et al? Well, too easily spoofed. With the results of my recent requests
// it's pretty clear that in the majority of cases you'll at least be left with a proxy/cache ip.
$this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars($_SERVER['REMOTE_ADDR']) : '';
$this->load = false;
// Load limit check (if applicable)
if ($config['limit_load'])
@ -149,11 +150,6 @@ class session
{
$this->load = array_slice(explode(' ', $load), 0, 1);
$this->load = floatval($this->load[0]);
if ($config['limit_load'] && $this->load > floatval($config['limit_load']))
{
trigger_error('BOARD_UNAVAILABLE');
}
}
else
{
@ -1043,13 +1039,21 @@ class user extends session
$this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $config['default_lang'];
// Is board disabled and user not an admin or moderator?
// @todo new ACL enabling board access while offline?
if ($config['board_disable'] && !defined('IN_LOGIN') && !$auth->acl_gets('a_', 'm_'))
{
$message = (!empty($config['board_disable_msg'])) ? $config['board_disable_msg'] : 'BOARD_DISABLE';
trigger_error($message);
}
// Is load exceeded?
if ($config['limit_load'] && $this->load !== false)
{
if ($this->load > floatval($config['limit_load']) && !defined('IN_LOGIN') && !$auth->acl_gets('a_', 'm_'))
{
trigger_error('BOARD_UNAVAILABLE');
}
}
// Does the user need to change their password? If so, redirect to the
// ucp profile reg_details page ... of course do not redirect if we're
// already in the ucp

2
phpBB/includes/template.php
View file

@ -126,7 +126,7 @@ class template
}
/**
* Display the handle and assign the output to a template variable
* Display the handle and assign the output to a template variable or return the content.
* @public
*/
function assign_display($handle, $template_var = '', $return_content = true, $include_once = false)

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

@ -49,6 +49,7 @@ class ucp_groups
while ($row = $db->sql_fetchrow($result))
{
$row['group_name'] = ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'];
$group_row[$row['group_id']] = $row;
}
$db->sql_freeresult($result);
@ -58,10 +59,6 @@ class ucp_groups
trigger_error('GROUP_NOT_EXIST');
}
$group_row[$group_id]['group_name'] = ($group_row[$group_id]['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row[$group_id]['group_name']] : $group_row[$group_id]['group_name'];
$group_row[$user->data['group_id']]['group_name'] = ($group_row[$user->data['group_id']]['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row[$user->data['group_id']]['group_name']] : $group_row[$user->data['group_id']]['group_name'];
switch ($action)
{
case 'change_default':

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

@ -512,7 +512,7 @@ function compose_pm($id, $mode, $action)
trigger_error($message);
}
$message_subject = stripslashes($subject);
$message_subject = $subject;
}
// Preview

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

@ -24,7 +24,7 @@ class ucp_register
{
trigger_error($user->lang['UCP_REGISTER_DISABLE']);
}
$config['max_reg_attempts'] = 0;
include($phpbb_root_path . 'includes/functions_profile_fields.' . $phpEx);
$confirm_id = request_var('confirm_id', '');
@ -236,6 +236,7 @@ class ucp_register
$sql_ary = array(
'username' => $username,
'user_permissions' => '',
'user_password' => md5($new_password),
'user_email' => $email,
'user_email_hash' => (int) crc32(strtolower($email)) . strlen($email),
@ -248,7 +249,15 @@ class ucp_register
'user_actkey' => $user_actkey,
'user_ip' => $user->ip,
'user_regdate' => time(),
'user_lastmark' => time(),
'user_lastvisit' => 0,
'user_lastpost_time' => 0,
'user_lastpage' => '',
'user_posts' => 0,
'user_dst' => 0,
'user_colour' => '',
'user_avatar' => '',
);
$sql = 'INSERT INTO ' . USERS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);

21
phpBB/install/install_install.php
View file

@ -929,30 +929,24 @@ class install_install extends module
{
case 'mssql':
case 'mssql_odbc':
$sql_query = preg_replace('#\# MSSQL IDENTITY (phpbb_[a-z_]+) (ON|OFF) \##s', 'SET IDENTITY_INSERT \1 \2', $sql_query);
$sql_query = preg_replace('#\# MSSQL IDENTITY (phpbb_[a-z_]+) (ON|OFF) \##s', 'SET IDENTITY_INSERT \1 \2;', $sql_query);
break;
case 'postgres':
$sql_query = preg_replace('#\# POSTGRES (BEGIN|COMMIT) \##s', '\1; ', $sql_query);
// Some versions of PGSQL don't like remarks, lets remove them.
remove_remarks($sql_query);
break;
case 'firebird':
$sql_query = str_replace('module_name', '"module_name"', $sql_query);
break;
case 'oracle':
remove_remarks($sql_query);
break;
default:
//$sql_query = preg_replace('#\# MSSQL IDENTITY (phpbb_[a-z_]+) (ON|OFF) \##s', '', $sql_query);
}
$sql_query = preg_replace('#phpbb_#i', $table_prefix, $sql_query);
$remove_remarks($sql_query);
// Since there is only one schema file we know the comment style and are able to remove it directly with remove_remarks
remove_remarks($sql_query);
$sql_query = split_sql_file($sql_query, ';');
foreach ($sql_query as $sql)
@ -1131,6 +1125,9 @@ class install_install extends module
'module_langname' => $cat_name,
'module_mode' => '',
'module_auth' => '',
'left_id' => 0,
'right_id' => 0,
);
$sql = 'INSERT INTO ' . MODULES_TABLE . ' ' . $db->sql_build_array('INSERT', $module_data);
@ -1155,6 +1152,9 @@ class install_install extends module
'module_langname' => $level2_name,
'module_mode' => '',
'module_auth' => '',
'left_id' => 0,
'right_id' => 0,
);
$sql = 'INSERT INTO ' . MODULES_TABLE . ' ' . $db->sql_build_array('INSERT', $module_data);
@ -1189,6 +1189,9 @@ class install_install extends module
'module_langname' => $row['title'],
'module_mode' => $module_mode,
'module_auth' => $row['auth'],
'left_id' => 0,
'right_id' => 0,
);
// $_module->update_module_data($module_data);

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

@ -616,19 +616,19 @@ CREATE TABLE phpbb_posts (
enable_smilies INTEGER DEFAULT 1 NOT NULL,
enable_magic_url INTEGER DEFAULT 1 NOT NULL,
enable_sig INTEGER DEFAULT 1 NOT NULL,
post_username VARCHAR(255),
post_subject BLOB SUB_TYPE TEXT,
post_text BLOB SUB_TYPE TEXT,
post_username VARCHAR(255) NULL,
post_subject BLOB SUB_TYPE TEXT NOT NULL,
post_text BLOB SUB_TYPE TEXT NOT NULL,
post_checksum VARCHAR(32) NOT NULL,
post_encoding VARCHAR(20) DEFAULT 'iso-8859-1' NOT NULL,
post_attachment INTEGER DEFAULT 0 NOT NULL,
bbcode_bitfield INTEGER DEFAULT 0 NOT NULL,
bbcode_uid VARCHAR(5) NOT NULL,
post_edit_time INTEGER DEFAULT 0 NOT NULL,
post_edit_reason BLOB SUB_TYPE TEXT,
post_edit_user INTEGER DEFAULT 0 NOT NULL,
post_edit_count INTEGER DEFAULT 0 NOT NULL,
post_edit_locked INTEGER DEFAULT 0 NOT NULL
post_edit_time INTEGER DEFAULT 0 NULL,
post_edit_reason BLOB SUB_TYPE TEXT NULL,
post_edit_user INTEGER DEFAULT 0 NULL,
post_edit_count INTEGER DEFAULT 0 NULL,
post_edit_locked INTEGER DEFAULT 0 NULL
);;
ALTER TABLE phpbb_posts ADD PRIMARY KEY (post_id);;
@ -999,7 +999,7 @@ END;;
# phpbb_smilies
CREATE TABLE phpbb_smilies (
smiley_id INTEGER NOT NULL,
code VARCHAR(10),
code VARCHAR(50),
emotion VARCHAR(50),
smiley_url VARCHAR(50),
smiley_width INTEGER DEFAULT 0 NOT NULL,
@ -1156,7 +1156,7 @@ CREATE TABLE phpbb_styles_template (
template_name VARCHAR(252) NOT NULL,
template_copyright VARCHAR(255) NOT NULL,
template_path VARCHAR(100) NOT NULL,
bbcode_bitfield INTEGER DEFAULT 0 NOT NULL,
bbcode_bitfield INTEGER DEFAULT 6921 NOT NULL,
template_storedb INTEGER DEFAULT 0 NOT NULL
);;
@ -1319,24 +1319,24 @@ CREATE TABLE phpbb_users (
user_id INTEGER NOT NULL,
user_type INTEGER DEFAULT 0 NOT NULL,
group_id INTEGER DEFAULT 3 NOT NULL,
user_permissions BLOB SUB_TYPE TEXT,
user_perm_from INTEGER DEFAULT 0 NOT NULL,
user_permissions BLOB SUB_TYPE TEXT NULL,
user_perm_from INTEGER DEFAULT 0 NULL,
user_ip VARCHAR(40) NOT NULL,
user_regdate INTEGER DEFAULT 0 NOT NULL,
username VARCHAR(252) NOT NULL,
user_password VARCHAR(40) NOT NULL,
user_passchg INTEGER DEFAULT 0 NOT NULL,
user_passchg INTEGER DEFAULT 0 NULL,
user_email VARCHAR(100) NOT NULL,
user_email_hash DOUBLE PRECISION DEFAULT 0 NOT NULL,
user_birthday VARCHAR(10) NOT NULL,
user_birthday VARCHAR(10) NULL,
user_lastvisit INTEGER DEFAULT 0 NOT NULL,
user_lastmark INTEGER DEFAULT 0 NOT NULL,
user_lastpost_time INTEGER DEFAULT 0 NOT NULL,
user_lastpage VARCHAR(200) NOT NULL,
user_last_confirm_key VARCHAR(10) NOT NULL,
user_warnings INTEGER DEFAULT 0 NOT NULL,
user_last_warning INTEGER DEFAULT 0 NOT NULL,
user_login_attempts INTEGER DEFAULT 0 NOT NULL,
user_last_confirm_key VARCHAR(10) NULL,
user_warnings INTEGER DEFAULT 0 NULL,
user_last_warning INTEGER DEFAULT 0 NULL,
user_login_attempts INTEGER DEFAULT 0 NULL,
user_posts INTEGER DEFAULT 0 NOT NULL,
user_lang VARCHAR(30) NOT NULL,
user_timezone DOUBLE PRECISION DEFAULT 0 NOT NULL,
@ -1370,20 +1370,20 @@ CREATE TABLE phpbb_users (
user_avatar_type INTEGER DEFAULT 0 NOT NULL,
user_avatar_width INTEGER DEFAULT 0 NOT NULL,
user_avatar_height INTEGER DEFAULT 0 NOT NULL,
user_sig BLOB SUB_TYPE TEXT,
user_sig_bbcode_uid VARCHAR(5) NOT NULL,
user_sig_bbcode_bitfield INTEGER DEFAULT 0 NOT NULL,
user_from VARCHAR(100) NOT NULL,
user_icq VARCHAR(15) NOT NULL,
user_aim VARCHAR(255) NOT NULL,
user_yim VARCHAR(255) NOT NULL,
user_msnm VARCHAR(255) NOT NULL,
user_jabber VARCHAR(255) NOT NULL,
user_website VARCHAR(200) NOT NULL,
user_occ VARCHAR(255) NOT NULL,
user_interests VARCHAR(255) NOT NULL,
user_sig BLOB SUB_TYPE TEXT NULL,
user_sig_bbcode_uid VARCHAR(5) NULL,
user_sig_bbcode_bitfield INTEGER DEFAULT 0 NULL,
user_from VARCHAR(100) NULL,
user_icq VARCHAR(15) NULL,
user_aim VARCHAR(255) NULL,
user_yim VARCHAR(255) NULL,
user_msnm VARCHAR(255) NULL,
user_jabber VARCHAR(255) NULL,
user_website VARCHAR(200) NULL,
user_occ VARCHAR(255) NULL,
user_interests VARCHAR(255) NULL,
user_actkey VARCHAR(32) NOT NULL,
user_newpasswd VARCHAR(32) NOT NULL
user_newpasswd VARCHAR(32) NULL
);;
ALTER TABLE phpbb_users ADD PRIMARY KEY (user_id);;

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

@ -934,18 +934,18 @@ CREATE TABLE [phpbb_posts] (
[enable_magic_url] [int] NOT NULL ,
[enable_sig] [int] NOT NULL ,
[post_username] [varchar] (255) NULL ,
[post_subject] [text] ,
[post_text] [text] ,
[post_subject] [text] NOT NULL ,
[post_text] [text] NOT NULL ,
[post_checksum] [varchar] (32) NOT NULL ,
[post_encoding] [varchar] (20) NOT NULL ,
[post_attachment] [int] NOT NULL ,
[bbcode_bitfield] [int] NOT NULL ,
[bbcode_uid] [varchar] (5) NOT NULL ,
[post_edit_time] [int] NOT NULL ,
[post_edit_reason] [text] ,
[post_edit_user] [int] NOT NULL ,
[post_edit_count] [int] NOT NULL ,
[post_edit_locked] [int] NOT NULL
[post_edit_time] [int] NULL ,
[post_edit_reason] [text] NULL,
[post_edit_user] [int] NULL ,
[post_edit_count] [int] NULL ,
[post_edit_locked] [int] NULL
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO
@ -1533,7 +1533,7 @@ GO
*/
CREATE TABLE [phpbb_smilies] (
[smiley_id] [int] IDENTITY (1, 1) NOT NULL ,
[code] [varchar] (10) NULL ,
[code] [varchar] (50) NULL ,
[emotion] [varchar] (50) NULL ,
[smiley_url] [varchar] (50) NULL ,
[smiley_width] [int] NOT NULL ,
@ -1719,7 +1719,7 @@ ALTER TABLE [phpbb_styles_template] WITH NOCHECK ADD
GO
ALTER TABLE [phpbb_styles_template] WITH NOCHECK ADD
CONSTRAINT [DF_phpbb_templa_bbcode_bitfield] DEFAULT (0) FOR [bbcode_bitfield],
CONSTRAINT [DF_phpbb_templa_bbcode_bitfield] DEFAULT (6921) FOR [bbcode_bitfield],
CONSTRAINT [DF_phpbb_templa_template_storedb] DEFAULT (0) FOR [template_storedb]
GO
@ -1981,24 +1981,24 @@ CREATE TABLE [phpbb_users] (
[user_id] [int] IDENTITY (1, 1) NOT NULL ,
[user_type] [int] NOT NULL ,
[group_id] [int] NOT NULL ,
[user_permissions] [text] ,
[user_perm_from] [int] NOT NULL ,
[user_permissions] [text] NULL ,
[user_perm_from] [int] NULL ,
[user_ip] [varchar] (40) NOT NULL ,
[user_regdate] [int] NOT NULL ,
[username] [varchar] (255) NOT NULL ,
[user_password] [varchar] (32) NOT NULL ,
[user_passchg] [int] NOT NULL ,
[user_passchg] [int] NULL ,
[user_email] [varchar] (100) NOT NULL ,
[user_email_hash] [float] NOT NULL ,
[user_birthday] [varchar] (10) NOT NULL ,
[user_birthday] [varchar] (10) NULL ,
[user_lastvisit] [int] NOT NULL ,
[user_lastmark] [int] NOT NULL ,
[user_lastpost_time] [int] NOT NULL ,
[user_lastpage] [varchar] (200) NOT NULL ,
[user_last_confirm_key] [varchar] (10) NOT NULL ,
[user_warnings] [int] NOT NULL ,
[user_last_warning] [int] NOT NULL ,
[user_login_attempts] [int] NOT NULL ,
[user_last_confirm_key] [varchar] (10) NULL ,
[user_warnings] [int] NULL ,
[user_last_warning] [int] NULL ,
[user_login_attempts] [int] NULL ,
[user_posts] [int] NOT NULL ,
[user_lang] [varchar] (30) NOT NULL ,
[user_timezone] [float] NOT NULL ,
@ -2032,20 +2032,20 @@ CREATE TABLE [phpbb_users] (
[user_avatar_type] [int] NOT NULL ,
[user_avatar_width] [int] NOT NULL ,
[user_avatar_height] [int] NOT NULL ,
[user_sig] [text] ,
[user_sig_bbcode_uid] [varchar] (5) NOT NULL ,
[user_sig_bbcode_bitfield] [int] NOT NULL ,
[user_from] [varchar] (100) NOT NULL ,
[user_icq] [varchar] (15) NOT NULL ,
[user_aim] [varchar] (255) NOT NULL ,
[user_yim] [varchar] (255) NOT NULL ,
[user_msnm] [varchar] (255) NOT NULL ,
[user_jabber] [varchar] (255) NOT NULL ,
[user_website] [varchar] (200) NOT NULL ,
[user_occ] [varchar] (255) NOT NULL ,
[user_interests] [varchar] (255) NOT NULL ,
[user_sig] [text] NULL ,
[user_sig_bbcode_uid] [varchar] (5) NULL ,
[user_sig_bbcode_bitfield] [int] NULL ,
[user_from] [varchar] (100) NULL ,
[user_icq] [varchar] (15) NULL ,
[user_aim] [varchar] (255) NULL ,
[user_yim] [varchar] (255) NULL ,
[user_msnm] [varchar] (255) NULL ,
[user_jabber] [varchar] (255) NULL ,
[user_website] [varchar] (200) NULL ,
[user_occ] [varchar] (255) NULL ,
[user_interests] [varchar] (255) NULL ,
[user_actkey] [varchar] (32) NOT NULL ,
[user_newpasswd] [varchar] (32) NOT NULL
[user_newpasswd] [varchar] (32) NULL
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO

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

@ -401,19 +401,19 @@ CREATE TABLE phpbb_posts (
enable_smilies tinyint(1) DEFAULT '1' NOT NULL,
enable_magic_url tinyint(1) DEFAULT '1' NOT NULL,
enable_sig tinyint(1) DEFAULT '1' NOT NULL,
post_username varchar(255),
post_subject text,
post_text mediumtext,
post_username varchar(255) NULL,
post_subject text NOT NULL,
post_text mediumtext NOT NULL,
post_checksum varchar(32) NOT NULL,
post_encoding varchar(20) DEFAULT 'iso-8859-1' NOT NULL,
post_attachment tinyint(1) DEFAULT '0' NOT NULL,
bbcode_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL,
bbcode_uid varchar(5) DEFAULT '' NOT NULL,
post_edit_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
post_edit_reason text,
post_edit_user mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
post_edit_count smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
post_edit_locked tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
post_edit_time int(11) UNSIGNED DEFAULT '0' NULL,
post_edit_reason text NULL,
post_edit_user mediumint(8) UNSIGNED DEFAULT '0' NULL,
post_edit_count smallint(5) UNSIGNED DEFAULT '0' NULL,
post_edit_locked tinyint(1) UNSIGNED DEFAULT '0' NULL,
PRIMARY KEY (post_id),
KEY forum_id (forum_id),
KEY topic_id (topic_id),
@ -642,7 +642,7 @@ CREATE TABLE phpbb_sitelist (
# Table: 'phpbb_smilies'
CREATE TABLE phpbb_smilies (
smiley_id tinyint(4) UNSIGNED NOT NULL auto_increment,
code varchar(10),
code varchar(50),
emotion varchar(50),
smiley_url varchar(50),
smiley_width tinyint(4) UNSIGNED NOT NULL,
@ -674,7 +674,7 @@ CREATE TABLE phpbb_styles_template (
template_name varchar(255) NOT NULL,
template_copyright varchar(255) NOT NULL,
template_path varchar(100) NOT NULL,
bbcode_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL,
bbcode_bitfield int(11) UNSIGNED DEFAULT '6921' NOT NULL,
template_storedb tinyint(1) DEFAULT '0' NOT NULL,
PRIMARY KEY (template_id),
UNIQUE template_name (template_name)
@ -874,31 +874,31 @@ CREATE TABLE phpbb_users (
user_id mediumint(8) UNSIGNED NOT NULL auto_increment,
user_type tinyint(1) DEFAULT '0' NOT NULL,
group_id mediumint(8) DEFAULT '3' NOT NULL,
user_permissions text,
user_permissions text NULL,
user_perm_from mediumint(8) DEFAULT '0' NOT NULL,
user_ip varchar(40) DEFAULT '' NOT NULL,
user_regdate int(11) DEFAULT '0' NOT NULL,
username varchar(255) DEFAULT '' NOT NULL,
user_password varchar(40) DEFAULT '' NOT NULL,
user_passchg int(11) DEFAULT '0' NOT NULL,
user_passchg int(11) DEFAULT '0' NULL,
user_email varchar(100) DEFAULT '' NOT NULL,
user_email_hash bigint(20) DEFAULT '0' NOT NULL,
user_birthday varchar(10) DEFAULT '' NOT NULL,
user_birthday varchar(10) DEFAULT '' NULL,
user_lastvisit int(11) DEFAULT '0' NOT NULL,
user_lastmark int(11) DEFAULT '0' NOT NULL,
user_lastpost_time int(11) DEFAULT '0' NOT NULL,
user_lastpage varchar(200) DEFAULT '' NOT NULL,
user_last_confirm_key varchar(10) DEFAULT '' NOT NULL,
user_warnings tinyint(4) DEFAULT '0' NOT NULL,
user_last_warning int(11) DEFAULT '0' NOT NULL,
user_login_attempts smallint(4) DEFAULT '0' NOT NULL,
user_last_confirm_key varchar(10) DEFAULT '' NULL,
user_warnings tinyint(4) DEFAULT '0' NULL,
user_last_warning int(11) DEFAULT '0' NULL,
user_login_attempts smallint(4) DEFAULT '0' NULL,
user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
user_lang varchar(30) DEFAULT '' NOT NULL,
user_timezone decimal(5,2) DEFAULT '0.0' NOT NULL,
user_dst tinyint(1) DEFAULT '0' NOT NULL,
user_dateformat varchar(30) DEFAULT 'd M Y H:i' NOT NULL,
user_style tinyint(4) DEFAULT '0' NOT NULL,
user_rank int(11) DEFAULT '0',
user_rank int(11) DEFAULT '0' NULL,
user_colour varchar(6) DEFAULT '' NOT NULL,
user_new_privmsg tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
user_unread_privmsg tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
@ -925,20 +925,20 @@ CREATE TABLE phpbb_users (
user_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
user_avatar_width tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
user_avatar_height tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
user_sig text,
user_sig_bbcode_uid varchar(5) DEFAULT '' NOT NULL,
user_sig_bbcode_bitfield int(11) DEFAULT '0' NOT NULL,
user_from varchar(100) DEFAULT '' NOT NULL,
user_icq varchar(15) DEFAULT '' NOT NULL,
user_aim varchar(255) DEFAULT '' NOT NULL,
user_yim varchar(255) DEFAULT '' NOT NULL,
user_msnm varchar(255) DEFAULT '' NOT NULL,
user_jabber varchar(255) DEFAULT '' NOT NULL,
user_website varchar(200) DEFAULT '' NOT NULL,
user_occ varchar(255) DEFAULT '' NOT NULL,
user_interests varchar(255) DEFAULT '' NOT NULL,
user_sig text NULL,
user_sig_bbcode_uid varchar(5) DEFAULT '' NULL,
user_sig_bbcode_bitfield int(11) DEFAULT '0' NULL,
user_from varchar(100) DEFAULT '' NULL,
user_icq varchar(15) DEFAULT '' NULL,
user_aim varchar(255) DEFAULT '' NULL,
user_yim varchar(255) DEFAULT '' NULL,
user_msnm varchar(255) DEFAULT '' NULL,
user_jabber varchar(255) DEFAULT '' NULL,
user_website varchar(200) DEFAULT '' NULL,
user_occ varchar(255) DEFAULT '' NULL,
user_interests varchar(255) DEFAULT '' NULL,
user_actkey varchar(32) DEFAULT '' NOT NULL,
user_newpasswd varchar(32) DEFAULT '' NOT NULL,
user_newpasswd varchar(32) DEFAULT '' NULL,
PRIMARY KEY (user_id),
KEY user_birthday (user_birthday(6)),
KEY user_email_hash (user_email_hash),

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

@ -828,7 +828,7 @@ CREATE TABLE phpbb_posts (
forum_id number(5) DEFAULT '0' NOT NULL,
poster_id number(8) DEFAULT '0' NOT NULL,
icon_id number(4) DEFAULT '0' NOT NULL,
poster_ip varchar2(40),
poster_ip varchar2(40) NOT NULL,
post_time number(11) DEFAULT '0' NOT NULL,
post_approved number(1) DEFAULT '1' NOT NULL,
post_reported number(1) DEFAULT '0' NOT NULL,
@ -836,19 +836,19 @@ CREATE TABLE phpbb_posts (
enable_smilies number(1) DEFAULT '1' NOT NULL,
enable_magic_url number(1) DEFAULT '1' NOT NULL,
enable_sig number(1) DEFAULT '1' NOT NULL,
post_username varchar2(255),
post_subject varchar2(1000),
post_text clob,
post_checksum varchar2(32),
post_encoding varchar2(20) DEFAULT 'iso-8859-1',
post_username varchar2(255) NULL,
post_subject varchar2(1000) NOT NULL,
post_text clob NOT NULL,
post_checksum varchar2(32) NOT NULL,
post_encoding varchar2(20) DEFAULT 'iso-8859-1' NOT NULL,
post_attachment number(1) DEFAULT '0' NOT NULL,
bbcode_bitfield number(11) DEFAULT '0' NOT NULL,
bbcode_uid varchar2(5) DEFAULT '',
post_edit_time number(11) DEFAULT '0' NOT NULL,
post_edit_reason varchar2(1000),
post_edit_user number(8) DEFAULT '0' NOT NULL,
post_edit_count number(5) DEFAULT '0' NOT NULL,
post_edit_locked number(1) DEFAULT '0' NOT NULL,
bbcode_uid varchar2(5) DEFAULT '' NOT NULL,
post_edit_time number(11) DEFAULT '0' NULL,
post_edit_reason varchar2(1000) NULL,
post_edit_user number(8) DEFAULT '0' NULL,
post_edit_count number(5) DEFAULT '0' NULL,
post_edit_locked number(1) DEFAULT '0' NULL,
CONSTRAINT pk_phpbb_posts PRIMARY KEY (post_id)
)
/
@ -1328,7 +1328,7 @@ END;
*/
CREATE TABLE phpbb_smilies (
smiley_id number(4) NOT NULL,
code varchar2(10),
code varchar2(50),
emotion varchar2(50),
smiley_url varchar2(50),
smiley_width number(4) NOT NULL,
@ -1402,7 +1402,7 @@ CREATE TABLE phpbb_styles_template (
template_name varchar2(255),
template_copyright varchar2(255),
template_path varchar2(100),
bbcode_bitfield number(11) DEFAULT '0' NOT NULL,
bbcode_bitfield number(11) DEFAULT '6921' NOT NULL,
template_storedb number(1) DEFAULT '0' NOT NULL,
CONSTRAINT pk_phpbb_styles_template PRIMARY KEY (template_id),
CONSTRAINT u_template_name UNIQUE (template_name)
@ -1715,32 +1715,32 @@ CREATE TABLE phpbb_users (
user_id number(8) NOT NULL,
user_type number(1) DEFAULT '0' NOT NULL,
group_id number(8) DEFAULT '3' NOT NULL,
user_permissions clob,
user_perm_from number(8) DEFAULT '0' NOT NULL,
user_ip varchar2(40) DEFAULT '',
user_permissions clob NULL,
user_perm_from number(8) DEFAULT '0' NULL,
user_ip varchar2(40) DEFAULT '' NOT NULL,
user_regdate number(11) DEFAULT '0' NOT NULL,
username varchar2(255) DEFAULT '',
user_password varchar2(40) DEFAULT '',
user_passchg number(11) DEFAULT '0' NOT NULL,
user_email varchar2(100) DEFAULT '',
username varchar2(255) DEFAULT '' NOT NULL,
user_password varchar2(40) DEFAULT '' NOT NULL,
user_passchg number(11) DEFAULT '0' NULL,
user_email varchar2(100) DEFAULT '' NOT NULL,
user_email_hash number(20) DEFAULT '0' NOT NULL,
user_birthday varchar2(10) DEFAULT '',
user_birthday varchar2(10) DEFAULT '' NULL,
user_lastvisit number(11) DEFAULT '0' NOT NULL,
user_lastmark number(11) DEFAULT '0' NOT NULL,
user_lastpost_time number(11) DEFAULT '0' NOT NULL,
user_lastpage varchar2(200) DEFAULT '',
user_last_confirm_key varchar2(10) DEFAULT '',
user_warnings number(4) DEFAULT '0' NOT NULL,
user_last_warning number(11) DEFAULT '0' NOT NULL,
user_login_attempts number(4) DEFAULT '0' NOT NULL,
user_last_confirm_key varchar2(10) DEFAULT '' NULL,
user_warnings number(4) DEFAULT '0' NULL,
user_last_warning number(11) DEFAULT '0' NULL,
user_login_attempts number(4) DEFAULT '0' NULL,
user_posts number(8) DEFAULT '0' NOT NULL,
user_lang varchar2(30) DEFAULT '',
user_lang varchar2(30) DEFAULT '' NOT NULL,
user_timezone number(5, 2) DEFAULT '1' NOT NULL,
user_dst number(1) DEFAULT '0' NOT NULL,
user_dateformat varchar2(30) DEFAULT 'd M Y H:i',
user_dateformat varchar2(30) DEFAULT 'd M Y H:i' NOT NULL,
user_style number(4) DEFAULT '0' NOT NULL,
user_rank number(11) DEFAULT '0',
user_colour varchar2(6) DEFAULT '',
user_rank number(11) DEFAULT '0' NULL,
user_colour varchar2(6) DEFAULT '' NOT NULL,
user_new_privmsg number(4) DEFAULT '0' NOT NULL,
user_unread_privmsg number(4) DEFAULT '0' NOT NULL,
user_last_privmsg number(11) DEFAULT '0' NOT NULL,
@ -1748,11 +1748,11 @@ CREATE TABLE phpbb_users (
user_full_folder number(11) DEFAULT '-3' NOT NULL,
user_emailtime number(11) DEFAULT '0' NOT NULL,
user_topic_show_days number(4) DEFAULT '0' NOT NULL,
user_topic_sortby_type varchar2(1) DEFAULT 't',
user_topic_sortby_dir varchar2(1) DEFAULT 'd',
user_topic_sortby_type varchar2(1) DEFAULT 't' NOT NULL,
user_topic_sortby_dir varchar2(1) DEFAULT 'd' NOT NULL,
user_post_show_days number(4) DEFAULT '0' NOT NULL,
user_post_sortby_type varchar2(1) DEFAULT 't',
user_post_sortby_dir varchar2(1) DEFAULT 'a',
user_post_sortby_type varchar2(1) DEFAULT 't' NOT NULL,
user_post_sortby_dir varchar2(1) DEFAULT 'a' NOT NULL,
user_notify number(1) DEFAULT '0' NOT NULL,
user_notify_pm number(1) DEFAULT '1' NOT NULL,
user_notify_type number(4) DEFAULT '0' NOT NULL,
@ -1762,24 +1762,24 @@ CREATE TABLE phpbb_users (
user_allow_viewemail number(1) DEFAULT '1' NOT NULL,
user_allow_massemail number(1) DEFAULT '1' NOT NULL,
user_options number(11) DEFAULT '893' NOT NULL,
user_avatar varchar2(255) DEFAULT '',
user_avatar varchar2(255) DEFAULT '' NOT NULL,
user_avatar_type number(2) DEFAULT '0' NOT NULL,
user_avatar_width number(4) DEFAULT '0' NOT NULL,
user_avatar_height number(4) DEFAULT '0' NOT NULL,
user_sig clob,
user_sig_bbcode_uid varchar2(5) DEFAULT '',
user_sig_bbcode_bitfield number(11) DEFAULT '0' NOT NULL,
user_from varchar2(100) DEFAULT '',
user_icq varchar2(15) DEFAULT '',
user_aim varchar2(255) DEFAULT '',
user_yim varchar2(255) DEFAULT '',
user_msnm varchar2(255) DEFAULT '',
user_jabber varchar2(255) DEFAULT '',
user_website varchar2(200) DEFAULT '',
user_occ varchar2(255) DEFAULT '',
user_interests varchar2(255) DEFAULT '',
user_actkey varchar2(32) DEFAULT '',
user_newpasswd varchar2(32) DEFAULT '',
user_sig clob NULL,
user_sig_bbcode_uid varchar2(5) DEFAULT '' NULLL,
user_sig_bbcode_bitfield number(11) DEFAULT '0' NULL,
user_from varchar2(100) DEFAULT '' NULL,
user_icq varchar2(15) DEFAULT '' NULL,
user_aim varchar2(255) DEFAULT '' NULL,
user_yim varchar2(255) DEFAULT '' NULL,
user_msnm varchar2(255) DEFAULT '' NULL,
user_jabber varchar2(255) DEFAULT '' NULL,
user_website varchar2(200) DEFAULT '' NULL,
user_occ varchar2(255) DEFAULT '' NULL,
user_interests varchar2(255) DEFAULT '' NULL,
user_actkey varchar2(32) DEFAULT '' NOT NULL,
user_newpasswd varchar2(32) DEFAULT '' NULL,
CONSTRAINT pk_phpbb_users PRIMARY KEY (user_id)
)
/

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

@ -563,19 +563,19 @@ CREATE TABLE phpbb_posts (
enable_smilies INT2 DEFAULT '1' NOT NULL,
enable_magic_url INT2 DEFAULT '1' NOT NULL,
enable_sig INT2 DEFAULT '1' NOT NULL,
post_username varchar(255),
post_subject TEXT,
post_text TEXT,
post_username varchar(255) NULL,
post_subject TEXT NOT NULL,
post_text TEXT NOT NULL,
post_checksum varchar(32) NOT NULL,
post_encoding varchar(20) DEFAULT 'iso-8859-1' NOT NULL,
post_attachment INT2 DEFAULT '0' NOT NULL,
bbcode_bitfield INT4 DEFAULT '0' NOT NULL,
bbcode_uid varchar(5) DEFAULT '' NOT NULL,
post_edit_time INT4 DEFAULT '0' NOT NULL,
post_edit_reason TEXT,
post_edit_user INT4 DEFAULT '0' NOT NULL,
post_edit_count INT2 DEFAULT '0' NOT NULL,
post_edit_locked INT2 DEFAULT '0' NOT NULL,
post_edit_time INT4 DEFAULT '0' NULL,
post_edit_reason TEXT NULL,
post_edit_user INT4 DEFAULT '0' NULL,
post_edit_count INT2 DEFAULT '0' NULL,
post_edit_locked INT2 DEFAULT '0' NULL,
PRIMARY KEY (post_id),
CHECK (topic_id>=0),
CHECK (forum_id>=0),
@ -915,7 +915,7 @@ CREATE SEQUENCE phpbb_smilies_seq;
CREATE TABLE phpbb_smilies (
smiley_id INT2 DEFAULT nextval('phpbb_smilies_seq'),
code varchar(10),
code varchar(50),
emotion varchar(50),
smiley_url varchar(50),
smiley_width INT2 NOT NULL,
@ -962,7 +962,7 @@ CREATE TABLE phpbb_styles_template (
template_name varchar(255) NOT NULL,
template_copyright varchar(255) NOT NULL,
template_path varchar(100) NOT NULL,
bbcode_bitfield INT4 DEFAULT '0' NOT NULL,
bbcode_bitfield INT4 DEFAULT '6921' NOT NULL,
template_storedb INT2 DEFAULT '0' NOT NULL,
PRIMARY KEY (template_id),
CHECK (bbcode_bitfield>=0)
@ -1217,31 +1217,31 @@ CREATE TABLE phpbb_users (
user_id INT4 DEFAULT nextval('phpbb_users_seq'),
user_type INT2 DEFAULT '0' NOT NULL,
group_id INT4 DEFAULT '3' NOT NULL,
user_permissions TEXT,
user_perm_from INT4 DEFAULT '0' NOT NULL,
user_permissions TEXT NULL,
user_perm_from INT4 DEFAULT '0' NULL,
user_ip varchar(40) DEFAULT '' NOT NULL,
user_regdate INT4 DEFAULT '0' NOT NULL,
username varchar(255) DEFAULT '' NOT NULL,
user_password varchar(40) DEFAULT '' NOT NULL,
user_passchg INT4 DEFAULT '0' NOT NULL,
user_passchg INT4 DEFAULT '0' NULL,
user_email varchar(100) DEFAULT '' NOT NULL,
user_email_hash INT8 DEFAULT '0' NOT NULL,
user_birthday varchar(10) DEFAULT '' NOT NULL,
user_birthday varchar(10) DEFAULT '' NULL,
user_lastvisit INT4 DEFAULT '0' NOT NULL,
user_lastmark INT4 DEFAULT '0' NOT NULL,
user_lastpost_time INT4 DEFAULT '0' NOT NULL,
user_lastpage varchar(200) DEFAULT '' NOT NULL,
user_last_confirm_key varchar(10) DEFAULT '' NOT NULL,
user_warnings INT2 DEFAULT '0' NOT NULL,
user_last_warning INT4 DEFAULT '0' NOT NULL,
user_login_attempts INT4 DEFAULT '0' NOT NULL,
user_last_confirm_key varchar(10) DEFAULT '' NULL,
user_warnings INT2 DEFAULT '0' NULL,
user_last_warning INT4 DEFAULT '0' NULL,
user_login_attempts INT4 DEFAULT '0' NULL,
user_posts INT4 DEFAULT '0' NOT NULL,
user_lang varchar(30) DEFAULT '' NOT NULL,
user_timezone decimal(5,2) DEFAULT '0.0' NOT NULL,
user_dst INT2 DEFAULT '0' NOT NULL,
user_dateformat varchar(30) DEFAULT 'd M Y H:i' NOT NULL,
user_style INT2 DEFAULT '0' NOT NULL,
user_rank INT4 DEFAULT '0',
user_rank INT4 DEFAULT '0' NULL,
user_colour varchar(6) DEFAULT '' NOT NULL,
user_new_privmsg INT2 DEFAULT '0' NOT NULL,
user_unread_privmsg INT2 DEFAULT '0' NOT NULL,
@ -1268,20 +1268,20 @@ CREATE TABLE phpbb_users (
user_avatar_type INT2 DEFAULT '0' NOT NULL,
user_avatar_width INT2 DEFAULT '0' NOT NULL,
user_avatar_height INT2 DEFAULT '0' NOT NULL,
user_sig TEXT,
user_sig_bbcode_uid varchar(5) DEFAULT '' NOT NULL,
user_sig_bbcode_bitfield INT4 DEFAULT '0' NOT NULL,
user_from varchar(100) DEFAULT '' NOT NULL,
user_icq varchar(15) DEFAULT '' NOT NULL,
user_aim varchar(255) DEFAULT '' NOT NULL,
user_yim varchar(255) DEFAULT '' NOT NULL,
user_msnm varchar(255) DEFAULT '' NOT NULL,
user_jabber varchar(255) DEFAULT '' NOT NULL,
user_website varchar(200) DEFAULT '' NOT NULL,
user_occ varchar(255) DEFAULT '' NOT NULL,
user_interests varchar(255) DEFAULT '' NOT NULL,
user_sig TEXT NULL,
user_sig_bbcode_uid varchar(5) DEFAULT '' NULL,
user_sig_bbcode_bitfield INT4 DEFAULT '0' NULL,
user_from varchar(100) DEFAULT '' NULL,
user_icq varchar(15) DEFAULT '' NULL,
user_aim varchar(255) DEFAULT '' NULL,
user_yim varchar(255) DEFAULT '' NULL,
user_msnm varchar(255) DEFAULT '' NULL,
user_jabber varchar(255) DEFAULT '' NULL,
user_website varchar(200) DEFAULT '' NULL,
user_occ varchar(255) DEFAULT '' NULL,
user_interests varchar(255) DEFAULT '' NULL,
user_actkey varchar(32) DEFAULT '' NOT NULL,
user_newpasswd varchar(32) DEFAULT '' NOT NULL,
user_newpasswd varchar(32) DEFAULT '' NULL,
PRIMARY KEY (user_id),
CHECK (user_posts>=0),
CHECK (user_new_privmsg>=0),

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

@ -221,8 +221,6 @@ INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('sessio
INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('upload_dir_size', '0', 1);
INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('warnings_last_gc', '0', 1);
# MSSQL IDENTITY phpbb_auth_options ON #
# -- Forum related auth options
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_list', 1);
@ -349,10 +347,6 @@ INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_delete', 1
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_img', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_flash', 1);
# MSSQL IDENTITY phpbb_auth_options OFF #
# MSSQL IDENTITY phpbb_auth_roles ON #
# -- standard auth roles
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Admin', 'ROLE_DESCRIPTION_ADMIN_STANDARD', 'a_', 1);
@ -377,66 +371,32 @@ INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('On Moderation Queue', 'ROLE_DESCRIPTION_FORUM_ONQUEUE', 'f_', 7);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Access + Polls', 'ROLE_DESCRIPTION_FORUM_POLLS', 'f_', 5);
# MSSQL IDENTITY phpbb_auth_roles OFF #
# MSSQL IDENTITY phpbb_styles ON #
# -- phpbb_styles
INSERT INTO phpbb_styles (style_name, style_copyright, template_id, theme_id, imageset_id) VALUES ('subSilver', '&copy; phpBB Group', 1, 1, 1);
# MSSQL IDENTITY phpbb_styles OFF #
# MSSQL IDENTITY phpbb_styles_imageset ON #
# -- 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', '', '', '', '', 'vote_lcap.gif*12*4', 'voting_bar.gif*12', 'vote_rcap.gif*12*4', 'progress_bar.gif*16*280', '', '', '', '', '', '', '', '', '', '');
# MSSQL IDENTITY phpbb_styles_imageset OFF #
# MSSQL IDENTITY phpbb_styles_template ON #
# -- phpbb_styles_template
INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path, bbcode_bitfield) VALUES ('subSilver', '&copy; phpBB Group', 'subSilver', 6921);
# MSSQL IDENTITY phpbb_styles_template OFF #
# MSSQL IDENTITY phpbb_styles_theme ON #
# -- phpbb_styles_theme
INSERT INTO phpbb_styles_theme (theme_name, theme_copyright, theme_path, theme_data) VALUES ('subSilver', '&copy; phpBB Group', 'subSilver', '');
# MSSQL IDENTITY phpbb_styles_theme OFF #
# MSSQL IDENTITY phpbb_lang ON #
# -- Language
INSERT INTO phpbb_lang (lang_iso, lang_dir, lang_english_name, lang_local_name, lang_author) VALUES ('en', 'en', 'English [ UK ]', 'English [ UK ]', 'phpBB Group');
# MSSQL IDENTITY phpbb_lang OFF #
# MSSQL IDENTITY phpbb_forums ON #
# -- Forums
INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed) VALUES ('My first Category', '', 1, 4, 0, 0, 1, 1, 1, 1, 2, 'Admin', 972086460, '', '', '', '', '', '', '', 0, 0);
INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts, forum_topics, forum_topics_real, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_days, prune_viewed) VALUES ('Test Forum 1', 'This is just a test forum.', 2, 3, 1, 1, 1, 1, 1, 1, 2, 'Admin', 972086460, '', '', '', '', '', '', '', 0, 0);
# MSSQL IDENTITY phpbb_forums OFF #
# MSSQL IDENTITY phpbb_users ON #
# -- Users / Anonymous user
INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_email, user_lang, user_style, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_colour, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (2, 1, 'Anonymous', 0, '', '', 'en', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
# -- username: Admin password: admin (change this or remove it ON #ce everything is working!)
INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (3, 7, 'Admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd) VALUES (3, 7, 'Admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
# -- bots
INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_lang, user_style, user_rank, user_colour, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd, user_email) VALUES (2, 8, 'Googlebot', 0, '', 'en', 1, 1, '9E8DA7', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
@ -444,11 +404,6 @@ INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_passw
INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_lang, user_style, user_rank, user_colour, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd, user_email) VALUES (2, 8, 'Alexa', 0, '', 'en', 1, 1, '9E8DA7', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
INSERT INTO phpbb_users (user_type, group_id, username, user_regdate, user_password, user_lang, user_style, user_rank, user_colour, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_from, user_icq, user_aim, user_yim, user_msnm, user_jabber, user_website, user_occ, user_interests, user_actkey, user_newpasswd, user_email) VALUES (2, 8, 'Inktomi', 0, '', 'en', 1, 1, '9E8DA7', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
# MSSQL IDENTITY phpbb_users OFF #
# MSSQL IDENTITY phpbb_groups ON #
# -- Groups
INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('GUESTS', 3, '', 0, '', '', '');
INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('INACTIVE', 3, '', 0, '', '', '');
@ -459,9 +414,6 @@ INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, gr
INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('ADMINISTRATORS', 3, 'AA0000', 1, '', '', '');
INSERT INTO phpbb_groups (group_name, group_type, group_colour, group_legend, group_avatar, group_desc, group_desc_uid) VALUES ('BOTS', 3, '9E8DA7', 1, '', '', '');
# MSSQL IDENTITY phpbb_groups OFF #
# -- User -> Group
INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (1, 1, 0, 0);
INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (4, 2, 0, 0);
@ -471,26 +423,15 @@ INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VAL
INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (8, 5, 0, 0);
INSERT INTO phpbb_user_group (group_id, user_id, user_pending, group_leader) VALUES (8, 6, 0, 0);
# MSSQL IDENTITY phpbb_ranks ON #
# -- Ranks
INSERT INTO phpbb_ranks (rank_title, rank_min, rank_special, rank_image) VALUES ('Site Admin', -1, 1, NULL);
# MSSQL IDENTITY phpbb_ranks OFF #
# MSSQL IDENTITY phpbb_bots ON #
# -- Bots
INSERT INTO phpbb_bots (bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES (1, 'Googlebot', 3, 'Googlebot/', '216.239.46.,64.68.8');
INSERT INTO phpbb_bots (bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES (1, 'Fastcrawler', 4, 'FAST MetaWeb Crawler', '66.151.181.');
INSERT INTO phpbb_bots (bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES (1, 'Alexa', 5, 'ia_archiver', '66.28.250.,209.237.238.');
INSERT INTO phpbb_bots (bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES (1, 'Inktomi', 6, 'Slurp/', '216.35.116.,66.196.');
# MSSQL IDENTITY phpbb_bots OFF #
# -- Roles data
# Standard Admin (a_)
@ -614,22 +555,12 @@ INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id,
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (8, 2, 0, 19, 0);
# MSSQL IDENTITY phpbb_topics ON #
# -- Demo Topic
INSERT INTO phpbb_topics (topic_title, topic_poster, topic_time, topic_views, topic_replies, topic_replies_real, forum_id, topic_status, topic_type, topic_first_post_id, topic_first_poster_name, topic_last_post_id, topic_last_poster_id, topic_last_poster_name, topic_last_post_time, topic_last_view_time, poll_title) VALUES ('Welcome to phpBB 3', 2, 972086460, 0, 0, 0, 2, 0, 0, 1, 'Admin', 1, 2, 'Admin', 972086460, 972086460, '');
# MSSQL IDENTITY phpbb_topics OFF #
# MSSQL IDENTITY phpbb_posts ON #
# -- Demo Post
INSERT INTO phpbb_posts (topic_id, forum_id, poster_id, icon_id, post_time, post_username, poster_ip, post_subject, post_text, post_checksum, bbcode_uid) VALUES (1, 2, 2, 1, 972086460, NULL, '127.0.0.1', 'Welcome to phpBB 3', 'This is an example post in your phpBB 3.0 installation. You may delete this post, this topic and even this forum if you like since everything seems to be working!', '', '');
# MSSQL IDENTITY phpbb_posts OFF #
# -- Smilies
INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':D', 'icon_biggrin.gif', 'Very Happy', 15, 15, 1);
INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':)', 'icon_smile.gif', 'Smile', 15, 15, 2);
@ -669,8 +600,6 @@ INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, disp
INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/exclaim.gif', 19, 19, 7, 1);
# MSSQL IDENTITY phpbb_search_wordlist ON #
# -- wordlist
INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('example', 0);
INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('post', 0);
@ -685,9 +614,6 @@ INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('seems', 0);
INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('working', 0);
INSERT INTO phpbb_search_wordlist (word_text, word_common) VALUES ('welcome', 0);
# MSSQL IDENTITY phpbb_search_wordlist OFF #
# -- wordmatch
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (1, 1, 0);
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (2, 1, 0);
@ -704,18 +630,12 @@ INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (12, 1
INSERT INTO phpbb_search_wordmatch (word_id, post_id, title_match) VALUES (3, 1, 1);
# MSSQL IDENTITY phpbb_reports_reasons ON #
# -- reasons
INSERT INTO phpbb_reports_reasons (reason_title, reason_description, reason_order) VALUES ('warez', 'The reported post contains links to pirated or illegal software', 1);
INSERT INTO phpbb_reports_reasons (reason_title, reason_description, reason_order) VALUES ('spam', 'The reported post has for only purpose to advertise for a website or another product', 2);
INSERT INTO phpbb_reports_reasons (reason_title, reason_description, reason_order) VALUES ('off_topic', 'The reported post is off topic', 3);
INSERT INTO phpbb_reports_reasons (reason_title, reason_description, reason_order) VALUES ('other', 'The reported post does not fit into any other category (please use the description field)', 4);
# MSSQL IDENTITY phpbb_reports_reasons OFF #
# MSSQL IDENTITY phpbb_extension_groups ON #
# -- extension_groups
INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('Images', 1, 1, 1, '', 0, '');
INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('Archives', 0, 1, 1, '', 0, '');
@ -724,11 +644,6 @@ INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mo
INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('Real Media', 3, 0, 2, '', 0, '');
INSERT INTO phpbb_extension_groups (group_name, cat_id, allow_group, download_mode, upload_icon, max_filesize, allowed_forums) VALUES ('Windows Media', 2, 0, 1, '', 0, '');
# MSSQL IDENTITY phpbb_extension_groups OFF #
# MSSQL IDENTITY phpbb_extensions ON #
# -- extensions
INSERT INTO phpbb_extensions (group_id, extension) VALUES (1, 'gif');
INSERT INTO phpbb_extensions (group_id, extension) VALUES (1, 'png');
@ -759,6 +674,4 @@ INSERT INTO phpbb_extensions (group_id, extension) VALUES (5, 'rm');
INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'wma');
INSERT INTO phpbb_extensions (group_id, extension) VALUES (6, 'wmv');
# MSSQL IDENTITY phpbb_extensions OFF #
# POSTGRES COMMIT #

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

@ -434,19 +434,19 @@ CREATE TABLE phpbb_posts (
enable_smilies tinyint(1) NOT NULL DEFAULT '1',
enable_magic_url tinyint(1) NOT NULL DEFAULT '1',
enable_sig tinyint(1) NOT NULL DEFAULT '1',
post_username varchar(255),
post_subject text(65535),
post_text mediumtext(16777215),
post_username varchar(255) NULL,
post_subject text(65535) NOT NULL,
post_text mediumtext(16777215) NOT NULL,
post_checksum varchar(32) NOT NULL,
post_encoding varchar(20) NOT NULL DEFAULT 'iso-8859-1',
post_attachment tinyint(1) NOT NULL DEFAULT '0',
bbcode_bitfield int(11) NOT NULL DEFAULT '0',
bbcode_uid varchar(5) NOT NULL DEFAULT '',
post_edit_time int(11) NOT NULL DEFAULT '0',
post_edit_reason text(65535),
post_edit_user mediumint(8) NOT NULL DEFAULT '0',
post_edit_count smallint(5) NOT NULL DEFAULT '0',
post_edit_locked tinyint(1) NOT NULL DEFAULT '0'
post_edit_time int(11) NULL DEFAULT '0',
post_edit_reason text(65535) NULL,
post_edit_user mediumint(8) NULL DEFAULT '0',
post_edit_count smallint(5) NULL DEFAULT '0',
post_edit_locked tinyint(1) NULL DEFAULT '0'
);
CREATE INDEX phpbb_posts_forum_id on phpbb_posts (forum_id);
@ -692,7 +692,7 @@ CREATE TABLE phpbb_sitelist (
# Table: phpbb_smilies
CREATE TABLE phpbb_smilies (
smiley_id INTEGER PRIMARY KEY NOT NULL,
code varchar(10),
code varchar(50),
emotion varchar(50),
smiley_url varchar(50),
smiley_width tinyint(4) NOT NULL,
@ -725,7 +725,7 @@ CREATE TABLE phpbb_styles_template (
template_name varchar(255) NOT NULL,
template_copyright varchar(255) NOT NULL,
template_path varchar(100) NOT NULL,
bbcode_bitfield int(11) NOT NULL DEFAULT '0',
bbcode_bitfield int(11) NOT NULL DEFAULT '6921',
template_storedb tinyint(1) NOT NULL DEFAULT '0'
);
@ -936,31 +936,31 @@ CREATE TABLE phpbb_users (
user_id INTEGER PRIMARY KEY NOT NULL,
user_type tinyint(1) NOT NULL DEFAULT '0',
group_id mediumint(8) NOT NULL DEFAULT '3',
user_permissions text(65535),
user_perm_from mediumint(8) NOT NULL DEFAULT '0',
user_permissions text(65535) NULL,
user_perm_from mediumint(8) NULL DEFAULT '0',
user_ip varchar(40) NOT NULL DEFAULT '',
user_regdate int(11) NOT NULL DEFAULT '0',
username varchar(255) NOT NULL DEFAULT '',
user_password varchar(40) NOT NULL DEFAULT '',
user_passchg int(11) NOT NULL DEFAULT '0',
user_passchg int(11) NULL DEFAULT '0',
user_email varchar(100) NOT NULL DEFAULT '',
user_email_hash bigint(20) NOT NULL DEFAULT '0',
user_birthday varchar(10) NOT NULL DEFAULT '',
user_birthday varchar(10) NULL DEFAULT '',
user_lastvisit int(11) NOT NULL DEFAULT '0',
user_lastmark int(11) NOT NULL DEFAULT '0',
user_lastpost_time int(11) NOT NULL DEFAULT '0',
user_lastpage varchar(200) NOT NULL DEFAULT '',
user_last_confirm_key varchar(10) NOT NULL DEFAULT '',
user_warnings tinyint(4) NOT NULL DEFAULT '0',
user_last_warning int(11) NOT NULL DEFAULT '0',
user_login_attempts smallint(4) NOT NULL DEFAULT '0',
user_last_confirm_key varchar(10) NULL DEFAULT '',
user_warnings tinyint(4) NULL DEFAULT '0',
user_last_warning int(11) NULL DEFAULT '0',
user_login_attempts smallint(4) NULL DEFAULT '0',
user_posts mediumint(8) NOT NULL DEFAULT '0',
user_lang varchar(30) NOT NULL DEFAULT '',
user_timezone decimal(5,2) NOT NULL DEFAULT '0.0',
user_dst tinyint(1) NOT NULL DEFAULT '0',
user_dateformat varchar(30) NOT NULL DEFAULT 'd M Y H:i',
user_style tinyint(4) NOT NULL DEFAULT '0',
user_rank int(11) DEFAULT '0',
user_rank int(11) NULL DEFAULT '0',
user_colour varchar(6) NOT NULL DEFAULT '',
user_new_privmsg tinyint(4) NOT NULL DEFAULT '0',
user_unread_privmsg tinyint(4) NOT NULL DEFAULT '0',
@ -987,20 +987,20 @@ CREATE TABLE phpbb_users (
user_avatar_type tinyint(2) NOT NULL DEFAULT '0',
user_avatar_width tinyint(4) NOT NULL DEFAULT '0',
user_avatar_height tinyint(4) NOT NULL DEFAULT '0',
user_sig text(65535),
user_sig_bbcode_uid varchar(5) NOT NULL DEFAULT '',
user_sig_bbcode_bitfield int(11) NOT NULL DEFAULT '0',
user_from varchar(100) NOT NULL DEFAULT '',
user_icq varchar(15) NOT NULL DEFAULT '',
user_aim varchar(255) NOT NULL DEFAULT '',
user_yim varchar(255) NOT NULL DEFAULT '',
user_msnm varchar(255) NOT NULL DEFAULT '',
user_jabber varchar(255) NOT NULL DEFAULT '',
user_website varchar(200) NOT NULL DEFAULT '',
user_occ varchar(255) NOT NULL DEFAULT '',
user_interests varchar(255) NOT NULL DEFAULT '',
user_sig text(65535) NULL,
user_sig_bbcode_uid varchar(5) NULL DEFAULT '',
user_sig_bbcode_bitfield int(11) NULL DEFAULT '0',
user_from varchar(100) NULL DEFAULT '',
user_icq varchar(15) NULL DEFAULT '',
user_aim varchar(255) NULL DEFAULT '',
user_yim varchar(255) NULL DEFAULT '',
user_msnm varchar(255) NULL DEFAULT '',
user_jabber varchar(255) NULL DEFAULT '',
user_website varchar(200) NULL DEFAULT '',
user_occ varchar(255) NULL DEFAULT '',
user_interests varchar(255) NULL DEFAULT '',
user_actkey varchar(32) NOT NULL DEFAULT '',
user_newpasswd varchar(32) NOT NULL DEFAULT ''
user_newpasswd varchar(32) NULL DEFAULT ''
);
CREATE INDEX phpbb_users_user_birthday on phpbb_users (user_birthday);

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

@ -109,6 +109,7 @@ $lang = array_merge($lang, array(
'NO_EXT_GROUP_NAME' => 'No Group Name entered',
'NO_EXT_GROUP_SPECIFIED' => 'No Extension Group specified',
'NO_IMAGE' => 'No Image',
'NO_THUMBNAIL_SUPPORT' => 'Thumbnail support has been disabled because there is no supported GD library available and the imagemagick executable could not be found.',
'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.',

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

@ -375,6 +375,7 @@ $lang = array_merge($lang, array(
'ALLOW_NO_CENSORS_EXPLAIN' => 'User can disable word censoring.',
'ALLOW_BOOKMARKS' => 'Allow bookmarking topics',
'ALLOW_BOOKMARKS_EXPLAIN' => 'User is able to store personal bookmarks',
));
?>

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

@ -388,13 +388,17 @@ $lang = array_merge($lang, array(
'LOG_CONFIG_AUTH' => '<b>Altered authentication settings</b>',
'LOG_CONFIG_AVATAR' => '<b>Altered avatar settings</b>',
'LOG_CONFIG_COOKIE' => '<b>Altered cookie settings</b>',
'LOG_CONFIG_DEFAULT' => '<b>Altered board defaults</b>',
'LOG_CONFIG_EMAIL' => '<b>Altered email settings</b>',
'LOG_CONFIG_FEATURES' => '<b>Altered board features</b>',
'LOG_CONFIG_LOAD' => '<b>Altered load settings</b>',
'LOG_CONFIG_MESSAGE' => '<b>Altered private message settings</b>',
'LOG_CONFIG_POST' => '<b>Altered post settings</b>',
'LOG_CONFIG_REGISTRATION' => '<b>Altered user registration settings</b>',
'LOG_CONFIG_SEARCH' => '<b>Altered search settings</b>',
'LOG_CONFIG_SECURITY' => '<b>Altered security settings</b>',
'LOG_CONFIG_SERVER' => '<b>Altered server settings</b>',
'LOG_CONFIG_SETTINGS' => '<b>Altered board settings</b>',
'LOG_CONFIG_SIGNATURE' => '<b>Altered signature settings</b>',
'LOG_CONFIG_VISUAL' => '<b>Altered visual confirmation settings</b>',
'LOG_DISALLOW_ADD' => '<b>Added disallowed username</b><br />&#187; %s',

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

@ -130,6 +130,7 @@ $lang = array_merge($lang, array(
'LOG_USER_LOCK' => '<b>User locked own topic</b><br />&#187; %s',
'LOG_USER_MOVE_POSTS_USER' => '<b>Moved all posts to forum "%s"</b>',
'LOG_USER_REACTIVATE_USER' => '<b>Forced user account re-activation</b>',
'LOG_USER_UNLOCK' => '<b>User unlocked own topic</b><br />&#187; %s',
'LOGIN_EXPLAIN_MCP' => 'To moderate this forum you must login.',
'LOGVIEW_VIEWTOPIC' => 'View Topic',
'LOGVIEW_VIEWLOGS' => 'View Topic Log',

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

@ -188,6 +188,7 @@ $lang = array_merge($lang, array(
'USER_CANNOT_DELETE' => 'You cannot delete posts in this forum',
'USER_CANNOT_EDIT' => 'You cannot edit posts in this forum',
'USER_CANNOT_REPLY' => 'You cannot reply in this forum',
'USER_CANNOT_FORUM_POST' => 'You are not able to do posting operations on this forum due to the forum type not supporting it.',
'USERNAME_DISALLOWED' => 'The username you entered has been banned.',
'USERNAME_TAKEN' => 'The username you entered is already in use, please select an alternative.',

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

@ -202,6 +202,7 @@ $lang = array_merge($lang, array(
'HIDE_ONLINE' => 'Hide my online status',
'HOLD_NEW_MESSAGES' => 'Do not accept new messages (New messages will be held back until enough space is available)',
'HOLD_NEW_MESSAGES_SHORT' => 'New messages will be held back',
'IF_FOLDER_FULL' => 'If Folder Full',
'IMPORTANT_NEWS' => 'Important announcements',

6
phpBB/memberlist.php
View file

@ -190,7 +190,7 @@ switch ($mode)
$db->sql_freeresult($result);
$template->assign_vars(array(
'PM_IMG' => $user->img('btn_pm', $user->lang['MESSAGE']))
'PM_IMG' => $user->img('btn_pm', $user->lang['SEND_PRIVATE_MESSAGE']))
);
break;
@ -411,7 +411,7 @@ switch ($mode)
'SIGNATURE' => (!empty($member['user_sig'])) ? str_replace("\n", '<br />', $member['user_sig']) : '',
'AVATAR_IMG' => $poster_avatar,
'PM_IMG' => $user->img('btn_pm', $user->lang['MESSAGE']),
'PM_IMG' => $user->img('btn_pm', $user->lang['SEND_PRIVATE_MESSAGE']),
'EMAIL_IMG' => $user->img('btn_email', $user->lang['EMAIL']),
'WWW_IMG' => $user->img('btn_www', $user->lang['WWW']),
'ICQ_IMG' => $user->img('btn_icq', $user->lang['ICQ']),
@ -1099,7 +1099,7 @@ switch ($mode)
'TOTAL_USERS' => ($total_users == 1) ? $user->lang['LIST_USER'] : sprintf($user->lang['LIST_USERS'], $total_users),
'PROFILE_IMG' => $user->img('btn_profile', $user->lang['PROFILE']),
'PM_IMG' => $user->img('btn_pm', $user->lang['MESSAGE']),
'PM_IMG' => $user->img('btn_pm', $user->lang['SEND_PRIVATE_MESSAGE']),
'EMAIL_IMG' => $user->img('btn_email', $user->lang['EMAIL']),
'WWW_IMG' => $user->img('btn_www', $user->lang['WWW']),
'ICQ_IMG' => $user->img('btn_icq', $user->lang['ICQ']),

1635
phpBB/posting.php
View file

File diff suppressed because it is too large Load diff

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

@ -95,7 +95,7 @@ function marklist(id, name, state)
<tr>
<td class="genmed">
<a href="{U_LOGIN_LOGOUT}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_LOGIN_LOGOUT}" /> {L_LOGIN_LOGOUT}</a>&nbsp;
<!-- IF U_RESTORE_PERMISSIONS --> &nbsp;<a href="{U_RESTORE_PERMISSIONS}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_LOGIN_LOGOUT}" /> {L_RESTORE_PERMISSIONS}</a><!-- ENDIF -->
<!-- IF U_RESTORE_PERMISSIONS --> &nbsp;<a href="{U_RESTORE_PERMISSIONS}"><img src="{T_THEME_PATH}/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_RESTORE_PERMISSIONS}" /> {L_RESTORE_PERMISSIONS}</a><!-- ENDIF -->
<!-- IF S_USER_LOGGED_IN -->
<!-- IF S_DISPLAY_PM --> &nbsp;<a href="{U_PRIVATEMSGS}"><img src="{T_THEME_PATH}/images/icon_mini_message.gif" width="12" height="13" border="0" alt="{L_PRIVATE_MESSAGES}" /> {PRIVATE_MESSAGE_INFO}<!-- IF PRIVATE_MESSAGE_INFO_UNREAD -->, {PRIVATE_MESSAGE_INFO_UNREAD}<!-- ENDIF --></a><!-- ENDIF -->
<!-- ELSE --> &nbsp;<a href="{U_REGISTER}"><img src="{T_THEME_PATH}/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" /> {L_REGISTER}</a>

BIN
phpBB/styles/subSilver/theme/images/icon_mini_faq.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 219 B

BIN
phpBB/styles/subSilver/theme/images/icon_mini_groups.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 222 B

After

Width:  |  Height:  |  Size: 222 B

BIN
phpBB/styles/subSilver/theme/images/icon_mini_login.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 233 B

After

Width:  |  Height:  |  Size: 233 B

BIN
phpBB/styles/subSilver/theme/images/icon_mini_members.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 223 B

After

Width:  |  Height:  |  Size: 223 B

BIN
phpBB/styles/subSilver/theme/images/icon_mini_message.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 232 B

BIN
phpBB/styles/subSilver/theme/images/icon_mini_profile.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 236 B

After

Width:  |  Height:  |  Size: 238 B

BIN
phpBB/styles/subSilver/theme/images/icon_mini_register.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 224 B

After

Width:  |  Height:  |  Size: 224 B

BIN
phpBB/styles/subSilver/theme/images/icon_mini_search.gif
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 237 B

After

Width:  |  Height:  |  Size: 238 B