1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-14 04:34:07 +02:00

Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11850

# By Nils Adermann (68) and others
# Via Andreas Fischer (12) and others
* 'develop' of github.com:phpbb/phpbb3: (102 commits)
  [ticket/11876] Replace MD5 with SHA256.
  [ticket/11876] Move checksum generation from build PHP files to phing build.xml
  [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.
  [prep-release-3.0.12] Update changelog for 3.0.12 release.
  [ticket/11873] Add unit test for large password input.
  [ticket/11873] Do not hash very large passwords in order to safe resources.
  [ticket/11862] Correct var names in user_delete() events due to prune-users
  [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.
  [prep-release-3.0.12] Bumping version number for 3.0.12 final.
  [ticket/11852] Add class file
  [ticket/11852] Move tests to folder with new class name
  [ticket/11852] Split filesystem and path_helper into 2 classes
  [ticket/11868] Add @depends to test
  [ticket/11868] Add functional test for registration
  [ticket/11868] Replace phpbb_request_interface references
  [ticket/11866] Only single backslash in .md files
  [ticket/11866] Remove outdated and broken develop script
  [ticket/11866] More namespaces
  [ticket/11866] Update some occurances of phpbb_db_ to new Namespace
  [ticket/11865] Convert old class name to namespaced version
  ...

Conflicts:
	tests/security/extract_current_page_test.php
	tests/session/testable_facade.php
This commit is contained in:
Nathan Guse
2013-09-30 18:24:46 -05:00
503 changed files with 3546 additions and 2454 deletions

View File

@@ -7,6 +7,8 @@
*
*/
namespace phpbb;
/**
* @ignore
*/
@@ -19,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Session class
* @package phpBB3
*/
class phpbb_session
class session
{
var $cookie_data = array();
var $page = array();
@@ -253,7 +255,7 @@ class phpbb_session
$this->forwarded_for = '';
}
if ($request->is_set($config['cookie_name'] . '_sid', phpbb_request_interface::COOKIE) || $request->is_set($config['cookie_name'] . '_u', phpbb_request_interface::COOKIE))
if ($request->is_set($config['cookie_name'] . '_sid', \phpbb\request\request_interface::COOKIE) || $request->is_set($config['cookie_name'] . '_u', \phpbb\request\request_interface::COOKIE))
{
$this->cookie_data['u'] = request_var($config['cookie_name'] . '_u', 0, false, true);
$this->cookie_data['k'] = request_var($config['cookie_name'] . '_k', '', false, true);
@@ -415,9 +417,9 @@ class phpbb_session
$provider = $phpbb_container->get('auth.provider.' . $method);
if (!($provider instanceof phpbb_auth_provider_interface))
if (!($provider instanceof \phpbb\auth\provider\provider_interface))
{
throw new \RuntimeException($provider . ' must implement phpbb_auth_provider_interface');
throw new \RuntimeException($provider . ' must implement \phpbb\auth\provider\provider_interface');
}
$ret = $provider->validate_session($this->data);
@@ -1032,7 +1034,7 @@ class phpbb_session
{
include($phpbb_root_path . "includes/captcha/captcha_factory." . $phpEx);
}
$captcha_factory = new phpbb_captcha_factory();
$captcha_factory = new \phpbb_captcha_factory();
$captcha_factory->garbage_collect($config['captcha_plugin']);
$sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '