aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11700] Replace some leftover phpbb_filesystem usesNils Adermann2013-09-171-1/+1
| | | | PHPBB3-11700
* [ticket/11700] Fix unit tests after develop mergeNils Adermann2013-09-171-1/+1
| | | | PHPBB3-11700
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-171-106/+33
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: [ticket/11832] Correct paths in tests [ticket/11832] Correct ROOT_PATH variable [ticket/11832] get_url() from phpbb_template_asset should return web path [ticket/11832] Fix INCLUDE(JS/CSS) [ticket/11832] Fix constructions of phpbb_filesystem [ticket/11832] Fix smiley paths [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request [ticket/11832] Fix build_url and the S_LOGIN_ACTION [ticket/11832] Changing comments to say app.php rather than index.php [ticket/11832] We must instantiate the $phpbb_filesystem in common [ticket/11832] Fix the web path corrections [ticket/11832] More extensive testing [ticket/11832] Use dirname(__FILE__) [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework" [ticket/11832] Make $phpbb_container a global initiated by the framework [ticket/11832] Fix log tests [ticket/11832] update_web_root_path helper and tests [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving) Conflicts: phpBB/common.php phpBB/config/services.yml phpBB/includes/bbcode.php phpBB/includes/functions.php phpBB/includes/functions_messenger.php phpBB/install/index.php phpBB/phpbb/filesystem.php phpBB/phpbb/template/twig/environment.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/dbal/migrator_test.php tests/extension/manager_test.php tests/extension/metadata_manager_test.php tests/filesystem/clean_path_test.php tests/mock/extension_manager.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * Merge remote-tracking branch 'EXreaction/ticket/11832' into developJoas Schilling2013-09-161-106/+33
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11832: [ticket/11832] Correct paths in tests [ticket/11832] Correct ROOT_PATH variable [ticket/11832] get_url() from phpbb_template_asset should return web path [ticket/11832] Fix INCLUDE(JS/CSS) [ticket/11832] Fix constructions of phpbb_filesystem [ticket/11832] Fix smiley paths [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request [ticket/11832] Fix build_url and the S_LOGIN_ACTION [ticket/11832] Changing comments to say app.php rather than index.php [ticket/11832] We must instantiate the $phpbb_filesystem in common [ticket/11832] Fix the web path corrections [ticket/11832] More extensive testing [ticket/11832] Use dirname(__FILE__) [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework" [ticket/11832] Make $phpbb_container a global initiated by the framework [ticket/11832] Fix log tests [ticket/11832] update_web_root_path helper and tests [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)
| | * [ticket/11832] Correct ROOT_PATH variableNathan Guse2013-09-151-1/+1
| | | | | | | | | | | | PHPBB3-11832
| | * [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-131-1/+8
| | | | | | | | | | | | PHPBB3-11832
| | * [ticket/11832] Fix constructions of phpbb_filesystemNathan Guse2013-09-131-5/+4
| | | | | | | | | | | | PHPBB3-11832
| | * [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_requestNathan Guse2013-09-131-41/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now symfony_request is also a service (removed the function phpbb_create_symfony_request). Inject symfony request into filesystem Cleanup for the tests PHPBB3-11832
| | * [ticket/11832] Fix build_url and the S_LOGIN_ACTIONNathan Guse2013-09-121-16/+18
| | | | | | | | | | | | PHPBB3-11832
| | * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-121-2/+25
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (187) and others # Via Andreas Fischer (2) and others * 'develop' of github.com:phpbb/phpbb3: (189 commits) [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [feature/oauth] Fix tabindex [feature/oauth] Fix bug on ucp_auth_link related to error display [feature/oauth] More small fixes [feature/oauth] More minor changes from review [feature/oauth] Fix small bug introduced by update in OAuth library [feature/oauth] Fix small issues on ucp pages [feature/oauth] Fix typo in OAuth logout method [feature/oauth] Make token storage service ignorant [feature/oauth] Update oauth::logout() to use clearAllTokens() [feature/oauth] Update storage implementation due to inteface change [feature/oauth] Update lusitanian/oauth to stable branch [feature/oauth] Update comment on oauth service exception [feature/oauth] Forgot to remove placeholder comment [feature/oauth] OAuth service exception [feature/oauth] A few more minor changes [feature/oauth] Changes due to code review [feature/oauth] Fix redirects [feature/oauth] Fix issues on ucp_login_link from review ...
| | * | [ticket/11832] Use $phpbb_filesystem instead of the container in append_sidNathan Guse2013-09-101-4/+6
| | | | | | | | | | | | | | | | PHPBB3-11832
| | * | [ticket/11832] update_web_root_path helper and testsNathan Guse2013-09-091-5/+2
| | | | | | | | | | | | | | | | PHPBB3-11832
| | * | [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)Nathan Guse2013-09-091-44/+5
| | | | | | | | | | | | | | | | | | | | | | | | Function moved from phpbb_get_web_root_path to filesystem::get_web_root_path PHPBB3-11832
* | | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-161-21/+85
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * | | [ticket/11795] Move PM popup JS to forum_fn.jsVjacheslav Trushkin2013-09-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move PM popup JavaScript from overall_header to forum_fn.js Use TWIG to escape PM popup URL PHPBB3-11795
| * | | [ticket/11795] Get rid of pagination JS variablesVjacheslav Trushkin2013-09-141-2/+1
| | |/ | |/| | | | | | | | | | | | | | | | Move pagination variables to data attributes Replace A_BASE_URL with BASE_URL and use TWIG to escape it PHPBB3-11795
| * | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauthJoseph Warner2013-09-101-1/+7
| |\ \ | | |/
| | * [ticket/develop/11832] Fix path detectionVjacheslav Trushkin2013-09-091-1/+7
| | | | | | | | | | | | | | | | | | Clean up path, do not count first / PHPBB3-11832
| * | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joseph Warner2013-09-061-16/+53
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/oauth Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673
| | * [ticket/11215] Add commented-out URL rewrite capability to .htaccessDavid King2013-09-021-0/+8
| | | | | | | | | | | | PHPBB3-11215
| | * [ticket/11215] Everything appears to be working...David King2013-08-311-19/+9
| | | | | | | | | | | | PHPBB3-11215
| | * Merge branch 'develop' into ticket/11215David King2013-08-311-2/+0
| | |\
| | | * [ticket/11754] Remove styleswitcher leftoversVjacheslav Trushkin2013-07-301-2/+0
| | | | | | | | | | | | | | | | PHPBB3-11754
| | * | Merge branch 'develop' into ticket/11215David King2013-07-131-8/+7
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (214 commits) [ticket/10999] Fix assets_version in ACP [prep-release-3.0.12] More changelog items for the 3.0.12 release. [ticket/11687] Add assets_version to phpbb_config [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)". [ticket/11674] Do not include vendor folder if there are no dependencies. [ticket/11685] Remove logout confirmation page [ticket/11684] Remove useless confirmation page after login and admin login [ticket/9657] Define user before injecting [ticket/9657] Remove old code [ticket/9657] Keep approval state of posts/topics when copying them [ticket/9657] Add functional tests for forking a copy [ticket/9657] Add functional test for splitting topic [ticket/11112] Do not change opensource.org link to https [ticket/9657] Add functional test for restoring a post/topic [ticket/11112] Use https for user-visible links to phpbb.com [ticket/9657] Fix a little error when moving softdeleted topics [ticket/9657] Add unit tests for softdeleting and moving posts/topics [ticket/9657] Remove last references to m_restore permission [ticket/9657] Fix english language :( [ticket/9657] Notifications do not require emails or jabber anymore ...
| | * | [ticket/11215] Don't try to use when it isn't thereDavid King2013-07-131-2/+2
| | | | | | | | | | | | | | | | PHPBB3-112515
| | * | [ticket/11215] Don't try to correct paths during testsDavid King2013-07-121-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11215
| | * | [ticket/11215] use globalDavid King2013-07-111-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11215
| | * | [ticket/11215] Correct for different URL but same path infoDavid King2013-07-061-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Symfony Request calculates path info, both of the following URLs give "/" as the path info: ./app.php and ./app.php/ This commit ensures that the proper correction is made. PHPBB3-11215
| | * | [ticket/11215] A few minor optimizations for phpbb_get_web_root_path()David King2013-07-061-8/+4
| | | | | | | | | | | | | | | | PHPBB3-11215
| | * | [ticket/11215] Correct paths when path info is used for controller accessDavid King2013-07-061-13/+49
| | | | | | | | | | | | | | | | PHPBB3-11215
| * | | [feature/oauth] Finish updating interface and related codeJoseph Warner2013-08-021-15/+4
| | | | | | | | | | | | | | | | PHPBB3-11673
| * | | [feature/oauth] Add get_login_data to the auth_provider_interfaceJoseph Warner2013-08-021-0/+20
| | | | | | | | | | | | | | | | PHPBB3-11673
| * | | [feature/oauth] Basic login functionality now workingJoseph Warner2013-07-241-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes are currently unique to OAuth and need to be made generic so that any auth provider can modify the login template. PHPBB3-11673
| * | | [feature/oauth] Fix outstanding issues with OAuthJoseph Warner2013-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes a temporary change that allows me to test against google. This will be removed shortly. PHPBB3-11673
| * | | [feature/oauth] Initial UI element added, this is non-finalJoseph Warner2013-07-221-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | At this point, all UI changes are purely for testing and should not be considered final. PHPBB3-11673
| * | | [feature/oauth] Initial step in creating OAuth login supportJoseph Warner2013-07-221-1/+11
| | |/ | |/| | | | | | | PHPBB3-11673
* | | [ticket/11700] Get the installer to run with namespacesNils Adermann2013-09-161-2/+2
| | | | | | | | | | | | PHPBB3-11700
* | | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-161-41/+41
| | | | | | | | | | | | PHPBB3-11700
* | | [ticket/11700] Load the dbms with namespacesNils Adermann2013-07-141-5/+5
| | | | | | | | | | | | PHPBB3-11700
* | | [ticket/11700] Modify all code to use the new interface namesNils Adermann2013-07-141-22/+22
|/ / | | | | | | PHPBB3-11700
* | Merge pull request #1541 from nickvergessen/ticket/11684Nathan Guse2013-07-131-2/+1
|\ \ | | | | | | [ticket/11684] Remove useless confirmation page after login and admin login
| * | [ticket/11684] Remove useless confirmation page after login and admin loginJoas Schilling2013-07-131-2/+1
| |/ | | | | | | PHPBB3-11684
* | [ticket/9657] Remove sql_visibility as it is always non-emptyJoas Schilling2013-07-111-6/+4
| | | | | | | | PHPBB3-9657
* | [ticket/9657] Use the service instead of the static classJoas Schilling2013-07-111-2/+3
| | | | | | | | PHPBB3-9657
* | Merge remote-tracking branch 'phpbb/develop' into ↵Joas Schilling2013-07-111-25/+27
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| * [ticket/9341] remove PREV_PAGE tpl var used for backward compatabilityDhruv2013-06-271-1/+0
| | | | | | | | PHPBB3-9341
| * [ticket/9341] Correctly named template varssakimahesh2013-06-221-2/+2
| | | | | | | | PHPBB3-9341
| * Merge branch 'develop-olympus' into developAndreas Fischer2013-05-161-1/+1
| |\ | | | | | | | | | | | | * develop-olympus: [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute
| | * [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absoluteJoas Schilling2013-05-161-1/+1
| | | | | | | | | | | | | | | | | | The given path is an absolute path in general, just not on our current system. PHPBB3-11545
| * | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-151-1/+1
| |\ \ | | |/ | | | | | | | | | * develop-olympus: [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string