aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'nickvergessen/ticket/12834' into develop-ascraeusMarc Alexander2014-07-081-1/+18
|\
| * [ticket/12834] Correctly match directories in session pageJoas Schilling2014-07-081-1/+18
| | | | | | | | | | | | Also clean path before working with it PHPBB3-12834
* | Merge pull request #2676 from Nicofuma/ticket/12787Joas Schilling2014-07-082-3/+117
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12787] Allow the route to say that the referer has to be used. * Nicofuma/ticket/12787: [ticket/12787] Updates phpbb_mock_controller_helper [ticket/12787] Add controller_helper::get_current_url() [ticket/12787] Remove one app.php when it's both in $path and $web_root_path [ticket/12787] Fix the absolute board url [ticket/12787] Use a parameter (_referer) instead of the Referer header [ticket/12099] Add unit tests for get_web_root_path_from_ajax_referer() [ticket/12099] Remove config again [ticket/12099] Correctly fix the path when performing AJAX requests [ticket/12099] Add request argument to path_helper service
| * | [ticket/12787] Add controller_helper::get_current_url()Tristan Darricau2014-07-081-1/+16
| | | | | | | | | | | | PHPBB3-12787
| * | [ticket/12787] Remove one app.php when it's both in $path and $web_root_pathTristan Darricau2014-07-051-1/+7
| | | | | | | | | | | | PHPBB3-12787
| * | [ticket/12787] Fix the absolute board urlTristan Darricau2014-06-291-1/+1
| | | | | | | | | | | | PHPBB3-12787
| * | [ticket/12787] Use a parameter (_referer) instead of the Referer headerTristan Darricau2014-06-291-2/+4
| | | | | | | | | | | | PHPBB3-12787
| * | [ticket/12099] Remove config againJoas Schilling2014-06-291-7/+3
| | | | | | | | | | | | PHPBB3-12099
| * | [ticket/12099] Correctly fix the path when performing AJAX requestsJoas Schilling2014-06-291-37/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the current request is a AJAX we need to fix the paths. We need to get the root path based on the Referer, so we can use the generated URLs in the template of the Referer. If we do not generate the relative path based on the Referer, but based on the currently requested URL, the generated URLs will not point to the intended locations: Referer desired URL desired relative root path memberlist.php faq.php ./ memberlist.php app.php/foo/bar ./ app.php/foo memberlist.php ../ app.php/foo app.php/fox ../ app.php/foo/bar memberlist.php ../../ ../page.php memberlist.php ./phpBB/ ../sub/page.php memberlist.php ./../phpBB/ PHPBB3-12099
| * | [ticket/12099] Add request argument to path_helper servicePico882014-06-291-2/+52
| | | | | | | | | | | | PHPBB3-12099
* | | Merge pull request #2695 from VSEphpbb/ticket/12812Tristan Darricau2014-07-081-0/+125
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12812] Add a migrator tool for config_text database changes * VSEphpbb/ticket/12812: [ticket/12812] Remove unused global $db from tests [ticket/12812] Improve migrator config_text tool tests [ticket/12812] Improve migrator config_text tool tests [ticket/12812] Add a migrator tool for config_text database changes
| * | | [ticket/12812] Add a migrator tool for config_text database changesMatt Friedman2014-07-051-0/+125
| | | | | | | | | | | | | | | | PHPBB3-12812
* | | | Merge pull request #2690 from Noxwizard/ticket/12802Tristan Darricau2014-07-071-3/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | [ticket/12802] Properly handle connection failures in SQLite3 * Noxwizard/ticket/12802: [ticket/12802] Properly handle connection failures in SQLite3
| * | | [ticket/12802] Properly handle connection failures in SQLite3Patrick Webster2014-07-031-3/+4
| | | | | | | | | | | | | | | | PHPBB3-12802
* | | | Merge pull request #2672 from Nicofuma/ticket/12782Joas Schilling2014-07-075-9/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12782] Use an interface for the phpbb event_dispatcher * Nicofuma/ticket/12782: [ticket/12782] Add doc block [ticket/12782] Use an interface for the phpbb event_dispatcher
| * | | | [ticket/12782] Add doc blockTristan Darricau2014-06-282-1/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-12782
| * | | | [ticket/12782] Use an interface for the phpbb event_dispatcherTristan Darricau2014-06-285-9/+42
| | |_|/ | |/| | | | | | | | | | PHPBB3-12782
* | | | [ticket/12515] Remove check for PostgreSQL 8.3+Joas Schilling2014-07-061-29/+2
| |_|/ |/| | | | | | | | PHPBB3-12515
* | | Merge remote-tracking branch 'github-nicofuma/ticket/12446' into ↵Nils Adermann2014-07-0421-37/+652
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nicofuma/ticket/12446: [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
| * | | [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_extsTristan Darricau2014-06-2622-39/+654
| | | | | | | | | | | | | | | | PHPBB3-12446
* | | | Merge pull request #2673 from nickvergessen/ticket/12783Tristan Darricau2014-07-031-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/12783 Move require:phpbb/phpbb to extra:phpbb/phpbb in Extensions composer.json files * nickvergessen/ticket/12783: [ticket/12783] Move phpbb requirement to extra->soft-require [ticket/12783] Correctly use dataProviders and mark tests as incomplete [ticket/12783] Move phpbb/phpbb require version to extra
| * | | | [ticket/12783] Move phpbb requirement to extra->soft-requireJoas Schilling2014-07-021-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12783
| * | | | [ticket/12783] Move phpbb/phpbb require version to extraJoas Schilling2014-06-281-2/+2
| | |/ / | |/| | | | | | | | | | PHPBB3-12783
* | | | Merge pull request #2670 from Nicofuma/ticket/12781Joas Schilling2014-07-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12781] Template regex for IF catch too many things * Nicofuma/ticket/12781: [ticket/12781] Add tests [ticket/12781] Template regex for IF catch too many things
| * | | | [ticket/12781] Template regex for IF catch too many thingsTristan Darricau2014-06-271-1/+1
| | |/ / | |/| | | | | | | | | | PHPBB3-12781
* | | | Merge pull request #2578 from marc1706/ticket/9801Joas Schilling2014-07-031-0/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9801] Allow display of page outside board directory on viewonline * marc1706/ticket/9801: [ticket/9801] Use empty instead of sizeof [ticket/9801] Remove spaces before * in docblock [ticket/9801] Add viewonline_helper service to allow proper testing [ticket/9801] Allow display of page outside board directory on viewonline
| * | | | [ticket/9801] Use empty instead of sizeofMarc Alexander2014-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9801
| * | | | [ticket/9801] Remove spaces before * in docblockMarc Alexander2014-06-261-7/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-9801
| * | | | [ticket/9801] Add viewonline_helper service to allow proper testingMarc Alexander2014-06-241-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The viewonline_helper service can and will be extended in the future which will allow us to also test the viewonline page better. PHPBB3-9801
* | | | | Merge pull request #2647 from Dragooon/ticket/12334Joas Schilling2014-07-037-14/+100
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12334] Add PROFILE_FIELD_VALUE_RAW template var * Dragooon/ticket/12334: [ticket/12334] Remove profile fields test group [ticket/12334] Add additional test for type_string [ticket/12334] Add string test for type_int [ticket/12334] Improve type_dropdown's test description [ticket/12334] Group profile fields test [ticket/12334] Change get_profile_value_raw_data to profile_value_raw_data [ticket/12334] Add get_profile_value_raw unit test for type_bool [ticket/12334] Add get_profile_value_raw unit test for type_date [ticket/12334] Add get_profile_value_raw unit tests for type_dropdown [ticket/12334] Add get_profile_value_raw unit test for type_string [ticket/12334] Add get_profile_value_raw unit test for type_url [ticket/12334] Add get_profile_value_raw unit tests for type_int [ticket/12334] Removed tests [ticket/12334] Dropdowns cannot be tested this way [ticket/12334] Added test get_profile_value_raw [ticket/12334] Changed from valueid to value_raw [ticket/12334] Implemented get_profile_valueid method [ticket/12334] Added field_novalue fall-back as requested [ticket/12334] Add PROFILE_FIELD_VALUEID template var
| * | | | | [ticket/12334] Changed from valueid to value_rawPayBas2014-06-247-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12334
| * | | | | [ticket/12334] Implemented get_profile_valueid methodPayBas2014-06-247-1/+84
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12334
| * | | | | [ticket/12334] Added field_novalue fall-back as requestedPayBas2014-06-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12334
| * | | | | [ticket/12334] Add PROFILE_FIELD_VALUEID template varPayBas2014-06-241-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12334
* | | | | | Merge pull request #2681 from Nicofuma/ticket/12790Joas Schilling2014-07-011-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12790] Use \phpbb\db\driver\driver_interface in prune_shadow_topics * Nicofuma/ticket/12790: [ticket/12790] Use \phpbb\db\driver\driver_interface in prune_shadow_topics
| * | | | | | [ticket/12790] Use \phpbb\db\driver\driver_interface in prune_shadow_topicsTristan Darricau2014-07-011-2/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | PHPBB3-12790
* | | | | | Merge pull request #2669 from Nicofuma/ticket/12777Joas Schilling2014-06-294-5/+43
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12777] Rename extension status functions and add is_configured() * Nicofuma/ticket/12777: [ticket/12777] Add tests for unavailable extension [ticket/12777] Add tests [ticket/12777] Add is_purged() [ticket/12777] Update doc block of is_configured() [ticket/12777] Rename extension status functions and add is_configured()
| * | | | | [ticket/12777] Add is_purged()Tristan Darricau2014-06-271-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12777
| * | | | | [ticket/12777] Update doc block of is_configured()Tristan Darricau2014-06-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12777
| * | | | | [ticket/12777] Rename extension status functions and add is_configured()Tristan Darricau2014-06-274-5/+28
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-12777
* | | | | Merge pull request #2598 from Nicofuma/ticket/12716Joas Schilling2014-06-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12716] Add the missing parameters in the call of clearToken * Nicofuma/ticket/12716: [ticket/12716] Use a string as session_id [ticket/12716] Add regression test [ticket/12716] Add the missing parameters in the call of clearToken
| * | | | | [ticket/12716] Add the missing parameters in the call of clearTokenTristan Darricau2014-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12716
* | | | | | Merge pull request #2660 from marc1706/ticket/12764Joas Schilling2014-06-271-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12764] Properly handle errors upon connecting to MySQLi database * marc1706/ticket/12764: [ticket/12764] Properly handle errors upon connecting to MySQLi database
| * | | | | | [ticket/12764] Properly handle errors upon connecting to MySQLi databaseMarc Alexander2014-06-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the db_connect_id gets set up by mysql_init(), the db_connect_id will be an object with empty settings instead of just empty. Even if mysql_real_connect() encounters an error upon connecting, the db_connect_id is still set. This will result in trying to just access the database which obviously does nothing. By setting db_connect_id to an empty string, the script will not try to query th database and properly handle any errors that occur upon connecting. PHPBB3-12764
* | | | | | | Merge pull request #2658 from lucifer4o/ticket/12771Joas Schilling2014-06-271-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12771] Bug in profilefield_base_migration when used in ext * lucifer4o/ticket/12771: [ticket/12771] Shanging substr to strpos [ticket/12771] Change var name [ticket/12771] Bug in profilefield_base_migration when used in ext
| * | | | | | | [ticket/12771] Shanging substr to strposStanislav Atanasov2014-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logical change ... PHPBB3-12771
| * | | | | | | [ticket/12771] Change var nameStanislav Atanasov2014-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change var name PHPBB3-12771
| * | | | | | | [ticket/12771] Bug in profilefield_base_migration when used in extStanislav Atanasov2014-06-261-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The base migration class should create lang entry for the new CPF but it is supposed to strip it of phpbb_ prefix. As extensions CPFs do not use phpbb_ prefix it will not create a lang entry. This is as simple solution as it can be done. PHPBB3-12771
* | | | | | | [ticket/12759] Fix type_bool and type_dropdown's UCP fieldsShitiz Garg2014-06-272-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12759
* | | | | | | [ticket/12759] Remove lang_helper from profilefields_managerShitiz Garg2014-06-271-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer required PHPBB3-12759