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

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
  [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
This commit is contained in:
Andreas Fischer 2011-01-30 01:17:06 +01:00
commit bafe3d9484
3 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/captcha/captcha_gd_wave.php
View file

@ -62,8 +62,8 @@ class captcha
'y' => mt_rand(10, 17) 'y' => mt_rand(10, 17)
), ),
'lower_left' => array( 'lower_left' => array(
'x' => mt_rand($img_x - 5, $img_x - 45), 'x' => mt_rand($img_x - 45, $img_x - 5),
'y' => mt_rand($img_y - 0, $img_y - 15) 'y' => mt_rand($img_y - 15, $img_y - 0),
), ),
); );

9
phpBB/styles/prosilver/template/overall_header.html
View file

@ -46,12 +46,9 @@
var onload_functions = new Array(); var onload_functions = new Array();
var onunload_functions = new Array(); var onunload_functions = new Array();
<!-- IF S_USER_PM_POPUP --> <!-- IF S_USER_PM_POPUP and S_NEW_PM -->
if ({S_NEW_PM}) var url = '{UA_POPUP_PM}';
{ window.open(url.replace(/&amp;/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400');
var url = '{UA_POPUP_PM}';
window.open(url.replace(/&amp;/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400');
}
<!-- ENDIF --> <!-- ENDIF -->
/** /**

7
phpBB/styles/subsilver2/template/overall_header.html
View file

@ -28,11 +28,8 @@
<script type="text/javascript"> <script type="text/javascript">
// <![CDATA[ // <![CDATA[
<!-- IF S_USER_PM_POPUP --> <!-- IF S_USER_PM_POPUP and S_NEW_PM -->
if ({S_NEW_PM}) popup('{UA_POPUP_PM}', 400, 225, '_phpbbprivmsg');
{
popup('{UA_POPUP_PM}', 400, 225, '_phpbbprivmsg');
}
<!-- ENDIF --> <!-- ENDIF -->
function popup(url, width, height, name) function popup(url, width, height, name)