mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 23:25:30 +02:00
Code Issues Releases Wiki Activity

Some fixes and improvements.

Browse Source 
#11817
#11851
#11801
#11461


git-svn-id: file:///svn/phpbb/trunk@7692 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-05-27 15:07:47 +00:00
parent 3ee5b28d3b
commit 9c0c1e14b6
8 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/docs/CHANGELOG.html
View File

@ -226,6 +226,9 @@ p a {
<li>[Fix] Update query for custom profiles in user management used wrong order for left/right delimiter (affecting mssql) (Bug #11781)</li>
<li>[Feature] Replaced outdated jabber class with the one from the flyspray project</li>
<li>Limit maximum number of allowed characters in messages to 60.000 by default. Admins should increase their PHP time limits if they want to raise this tremedously.</li>
<li>[Feature] The converter no longer relies on the smiley ID to decide if it should be displayed on the posting page</li>
<li>[Fix] Inconsistent display of more smileys link fixed (Bug #11801)</li>
<li>[Fix] Outbox messages are no always neither new nor unread post-conversion(Bug #11461)</li>
</ul>
</div>

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

@ -593,7 +593,7 @@ class acp_permissions
{
global $user, $auth;
$psubmit = request_var('psubmit', array(0));
$psubmit = request_var('psubmit', array(0 => array(0 => 0)));
// User or group to be set?
$ug_type = (sizeof($user_id)) ? 'user' : 'group';

7
phpBB/includes/functions_convert.php
View File

@ -2405,4 +2405,11 @@ function relative_base($path, $is_relative = true, $line = false, $file = false)
return $convert->options['forum_path'] . '/' . $path;
}
function get_smiley_display()
{
static $smiley_count = 0;
$smiley_count++;
return ($smiley_count < 50) ? 1 : 0;
}
?>

10
phpBB/install/convertors/convert_phpbb20.php
View File

@ -31,7 +31,7 @@ unset($dbpasswd);
*/
$convertor_data = array(
'forum_name' => 'phpBB 2.0.x',
'version' => '0.92',
'version' => '1.0.RC2-dev',
'phpbb_version' => '3.0.0',
'author' => '<a href="http://www.phpbb.com/">phpBB Group</a>',
'dbms' => $dbms,
@ -540,9 +540,7 @@ if (!$get_info)
array('smiley_width', 'smilies.smile_url', 'get_smiley_width'),
array('smiley_height', 'smilies.smile_url', 'get_smiley_height'),
array('smiley_order', 'smilies.smilies_id', ''),
array('display_on_posting', 'smilies.smilies_id', array(
'execute' => '{RESULT} = ({VALUE}[0] <= 20) ? 1 : 0;',
)),
array('display_on_posting', 'smilies.smilies_id', 'get_smiley_display'),
'order_by' => 'smilies.smilies_id ASC',
),
@ -714,8 +712,8 @@ if (!$get_info)
array('user_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'),
array('author_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'),
array('pm_deleted', 0, ''),
array('pm_new', 'privmsgs.privmsgs_type', 'phpbb_new_pm'),
array('pm_unread', 'privmsgs.privmsgs_type', 'phpbb_unread_pm'),
array('pm_new', 0, ''),
array('pm_unread', 0, ''),
array('pm_replied', 0, ''),
array('pm_marked', 0, ''),
array('pm_forwarded', 0, ''),

2
phpBB/install/install_convert.php
View File

@ -1162,6 +1162,8 @@ class install_convert extends module
$schema['group_by'] = array($schema['group_by']);
foreach($sql_data['select_fields'] as $select)
{
$alias = strpos(strtolower($select), ' as ');
$select = ($alias) ? substr($select, 0, $alias) : $select;
if (!in_array($select, $schema['group_by']))
{
$schema['group_by'][] = $select;

1
phpBB/posting.php
View File

@ -1264,7 +1264,6 @@ $template->assign_vars(array(
'S_BBCODE_ALLOWED' => $bbcode_status,
'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '',
'S_SMILIES_ALLOWED' => $smilies_status,
'S_SHOW_SMILEY_LINK' => $smilies_status,
'S_SMILIES_CHECKED' => ($smilies_checked) ? ' checked="checked"' : '',
'S_SIG_ALLOWED' => ($auth->acl_get('f_sigs', $forum_id) && $config['allow_sig'] && $user->data['is_registered']) ? true : false,
'S_SIGNATURE_CHECKED' => ($sig_checked) ? ' checked="checked"' : '',

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

@ -113,7 +113,7 @@
<a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a>
<!-- END smiley -->
<!-- ENDIF -->
<!-- IF S_SHOW_SMILEY_LINK -->
<!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED-->
<br /><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=350,resizable=yes,scrollbars=yes,WIDTH=300'); return false;">{L_MORE_SMILIES}</a>
<!-- ENDIF -->
@ -180,8 +180,8 @@
<fieldset class="submit-buttons">
{S_HIDDEN_ADDRESS_FIELD}
{S_HIDDEN_FIELDS}
<!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="9" name="load" value="{L_LOAD}" class="button2" onclick="load_draft = true;" />&nbsp; <!-- ENDIF -->
<!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="8" name="save" value="{L_SAVE}" class="button2" />&nbsp; <!-- ENDIF -->
<!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="9" name="load" value="{L_LOAD}" class="button2" onclick="load_draft = true;" />&nbsp; <!-- ENDIF -->
<!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="8" name="save" value="{L_SAVE}" class="button2" />&nbsp; <!-- ENDIF -->
<input type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> />&nbsp;
<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;

4
phpBB/styles/subsilver2/template/posting_body.html
View File

@ -202,11 +202,11 @@
<td class="row2" valign="top">
<script type="text/javascript">
<!--
var form_name = 'postform';
var text_name = 'message';
//-->
</script>
</script>
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<!-- INCLUDE posting_buttons.html -->