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

further fixes

Browse source 
- fix infinite loop on checking ban for those not having ever visited the page (or removed all session cookies)
- avatar width/height switched in language files
- fix windows switching to background on IE7 (smlies window for example)


git-svn-id: file:///svn/phpbb/trunk@8224 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-11-03 20:31:05 +00:00
parent 61fc9605fa
commit 18d014c765
6 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/session.php
View file

@ -1018,7 +1018,8 @@ class session
// If the session is empty we need to create a valid one... // If the session is empty we need to create a valid one...
if (empty($this->session_id)) if (empty($this->session_id))
{ {
$this->session_create(ANONYMOUS); // This seems to be no longer needed? - #14971
// $this->session_create(ANONYMOUS);
} }
// Initiate environment ... since it won't be set at this stage // Initiate environment ... since it won't be set at this stage

4
phpBB/install/install_install.php
View file

@ -482,7 +482,7 @@ class install_install extends module
'LEGEND_EXPLAIN' => $lang['FILES_OPTIONAL_EXPLAIN'], 'LEGEND_EXPLAIN' => $lang['FILES_OPTIONAL_EXPLAIN'],
)); ));
$directories = array('config.'.$phpEx, 'images/avatars/upload/'); $directories = array('config.' . $phpEx, 'images/avatars/upload/');
foreach ($directories as $dir) foreach ($directories as $dir)
{ {
@ -931,7 +931,7 @@ class install_install extends module
// Note that all we check is that the file has _something_ in it // Note that all we check is that the file has _something_ in it
// We don't compare the contents exactly - if they can't upload // We don't compare the contents exactly - if they can't upload
// a single file correctly, it's likely they will have other problems.... // a single file correctly, it's likely they will have other problems....
if (filesize($phpbb_root_path . 'config.'.$phpEx) > 10) if (filesize($phpbb_root_path . 'config.' . $phpEx) > 10)
{ {
$written = true; $written = true;
} }

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

@ -96,11 +96,11 @@ $lang = array_merge($lang, array(
'AVATAR_STORAGE_PATH' => 'Avatar storage path', 'AVATAR_STORAGE_PATH' => 'Avatar storage path',
'AVATAR_STORAGE_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/avatars/upload</samp>.', 'AVATAR_STORAGE_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/avatars/upload</samp>.',
'MAX_AVATAR_SIZE' => 'Maximum avatar dimensions', 'MAX_AVATAR_SIZE' => 'Maximum avatar dimensions',
'MAX_AVATAR_SIZE_EXPLAIN' => 'Height x Width in pixels.', 'MAX_AVATAR_SIZE_EXPLAIN' => 'Width x Height in pixels.',
'MAX_FILESIZE' => 'Maximum avatar file size', 'MAX_FILESIZE' => 'Maximum avatar file size',
'MAX_FILESIZE_EXPLAIN' => 'For uploaded avatar files.', 'MAX_FILESIZE_EXPLAIN' => 'For uploaded avatar files.',
'MIN_AVATAR_SIZE' => 'Minimum avatar dimensions', 'MIN_AVATAR_SIZE' => 'Minimum avatar dimensions',
'MIN_AVATAR_SIZE_EXPLAIN' => 'Height x Width in pixels.', 'MIN_AVATAR_SIZE_EXPLAIN' => 'Width x Height in pixels.',
)); ));
// Message Settings // Message Settings

9
phpBB/styles/prosilver/template/editor.js
View file

@ -34,7 +34,7 @@ function initInsertions()
{ {
var doc; var doc;
if( document.forms[form_name]) if (document.forms[form_name])
{ {
doc = document; doc = document;
} }
@ -44,11 +44,16 @@ function initInsertions()
} }
var textarea = doc.forms[form_name].elements[text_name]; var textarea = doc.forms[form_name].elements[text_name];
if (is_ie && typeof(baseHeight) != 'number') if (is_ie && typeof(baseHeight) != 'number')
{ {
textarea.focus(); textarea.focus();
baseHeight = doc.selection.createRange().duplicate().boundingHeight; baseHeight = doc.selection.createRange().duplicate().boundingHeight;
// document.body.focus();
if (!document.forms[form_name])
{
document.body.focus();
}
} }
} }

2
phpBB/styles/prosilver/template/ucp_pm_options.html
View file

@ -14,7 +14,7 @@
<ol class="def-rules"> <ol class="def-rules">
<!-- BEGIN rule --> <!-- BEGIN rule -->
<li><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="right-box button2" /><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->: {rule.FOLDER}<!-- ENDIF --></li> <li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button2" /></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->: {rule.FOLDER}<!-- ENDIF --></li>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<li><strong>{L_NO_RULES_DEFINED}</strong></li> <li><strong>{L_NO_RULES_DEFINED}</strong></li>
<!-- END rule --> <!-- END rule -->

6
phpBB/styles/subsilver2/template/editor.js
View file

@ -48,7 +48,11 @@ function initInsertions()
{ {
textarea.focus(); textarea.focus();
baseHeight = doc.selection.createRange().duplicate().boundingHeight; baseHeight = doc.selection.createRange().duplicate().boundingHeight;
// document.body.focus();
if (!document.forms[form_name])
{
document.body.focus();
}
} }
} }