|
From: Andrew N. \(MHobbit\) <men...@us...> - 2005-11-25 02:52:24
|
Update of /cvsroot/mxbb/core/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26951/includes Modified Files: page_header.php page_tail.php Log Message: Security updates round... most code implemented from phpBB 2.0.18. Index: page_header.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_header.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** page_header.php 2 Oct 2005 21:24:30 -0000 1.25 --- page_header.php 25 Nov 2005 02:52:16 -0000 1.26 *************** *** 513,516 **** --- 513,525 ---- { $layouttemplate->assign_block_vars('switch_user_logged_out', array()); + + // + // Allow autologin? + // + if (!isset($board_config['allow_autologin']) || $board_config['allow_autologin'] ) + { + $layouttemplate->assign_block_vars('switch_allow_autologin', array()); + $layouttemplate->assign_block_vars('switch_user_logged_out.switch_allow_autologin', array()); + } } else Index: page_tail.php =================================================================== RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** page_tail.php 1 Oct 2005 14:10:45 -0000 1.17 --- page_tail.php 25 Nov 2005 02:52:16 -0000 1.18 *************** *** 24,27 **** --- 24,29 ---- } + global $do_gzip_compress; + // // Show the overall footer. *************** *** 62,66 **** 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '', 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', ! 'TRANSLATION_INFO' => ( isset($lang['TRANSLATION_INFO']) ) ? $lang['TRANSLATION_INFO'] : '', 'ADMIN_LINK' => $admin_link) ); --- 64,68 ---- 'MX_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '', 'PHPBB_VERSION' => ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '', ! 'TRANSLATION_INFO' => (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''), 'ADMIN_LINK' => $admin_link) ); |