aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1739 from nickvergessen/ticket/11871Nathan Guse2013-10-032-5/+28
|\ | | | | [ticket/11871] Allow backslash in classnames for Modules
| * [ticket/11871] Fallback to int ID of the module, when creating linksJoas Schilling2013-10-021-4/+27
| | | | | | | | | | | | | | | | Firefox is currently unable to correctly copy a urlencoded \ so users will be unable to post links to modules. However we can still fallback to the id instead of the name, so we do that in this case. PHPBB3-11871
| * [ticket/11871] Allow backslash in classnames for ModulesJoas Schilling2013-09-271-1/+1
| | | | | | | | PHPBB3-11871
* | Merge pull request #1654 from rechosen/ticket/11786Nathan Guse2013-10-032-4/+4
|\ \ | | | | | | [ticket/11786] Fix various defects in PHPDoc in-code documentation
| * | [ticket/11786] Fix indentation in the PHPDoc of core.group_delete_user_beforerechosen2013-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | The core.group_delete_user_before event had bad indentation in its PHPDoc. Fixed. PHPBB3-11786
| * | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786rechosen2013-09-2320-191/+2012
| |\ \
| * | | [ticket/11786] Fix PHPDoc documentation of a few eventsrechosen2013-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some PHPDoc errors I noticed while working on the karma extension. Mostly spacing issues or omitted characters, though there was one description that made no sense at all. PHPBB3-11786
* | | | Merge pull request #1735 from nickvergessen/ticket/11852Nathan Guse2013-09-304-19/+20
|\ \ \ \ | | | | | | | | | | Ticket/11852 filesystem class must not depend on a web request
| * | | | [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-264-19/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-11852
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-281-0/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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.
| * | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-281-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [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/11873] Do not hash very large passwords in order to safe resources.Joas Schilling2013-09-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11873
| | * | | | [prep-release-3.0.12] Bumping version number for 3.0.12 final.Andreas Fischer2013-09-271-1/+1
| | | | | |
| | * | | | [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.Andreas Fischer2013-09-021-1/+1
| | | | | |
* | | | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comments after incorrect merge of previous PR. PHPBB3-11862
* | | | | | Merge remote-tracking branch 'Marc/ticket/11862' into developJoas Schilling2013-09-271-8/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11862: [ticket/11862] Correct var names in user_delete() events due to prune-users
| * | | | | | [ticket/11862] Correct var names in user_delete() events due to prune-usersMarc Alexander2013-09-251-8/+10
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The prune-users feature modified the names of the used variables in this function. However, the variable names for the two events in this function were not changed to reflect that. This patch will take care of it. PHPBB3-11862
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-261-1/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/11864] Do not call exit after display_progress_bar in acp_forums
| * | | | | [ticket/11864] Do not call exit after display_progress_bar in acp_forumsMarc Alexander2013-09-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The progress bar is called with the method display_progress_bar() in the acp_forums files. This method then call adm_page_footer() which also calls exit_handler(). Therefore, the exit; in acp_forums after $this->display_progress_bar() is obsolete and shouldn't exist in the first place. PHPBB3-11864
* | | | | | [ticket/11868] Replace phpbb_request_interface referencesVjacheslav Trushkin2013-09-262-6/+6
| |_|_|/ / |/| | | | | | | | | | | | | | PHPBB3-11868
* | | | | Merge pull request #1733 from nickvergessen/ticket/11866David King2013-09-252-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Ticket/11866 Fix some more namespace issues
| * | | | | [ticket/11866] More namespacesJoas Schilling2013-09-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11866
| * | | | | [ticket/11866] Update some occurances of phpbb_db_ to new NamespaceJoas Schilling2013-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11866
* | | | | | Merge pull request #1732 from nickvergessen/ticket/11865David King2013-09-251-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/11865] includes/bbcode.php is missing namespace change
| * | | | | | [ticket/11865] Convert old class name to namespaced versionJoas Schilling2013-09-261-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11865
* | | | | | [ticket/11805] Move page-url generating code into a new functionJoas Schilling2013-09-251-28/+29
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11805
* | | | | | [ticket/11805] Do not generate the same link twiceJoas Schilling2013-09-251-20/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to generate the prev/next links twice PHPBB3-11805
* | | | | | [ticket/11805] Allow specifying the page in the route for paginationJoas Schilling2013-09-251-6/+45
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of "app.php?controller=news&start=10" authors might prefer having the pagination in the route. So the sample link from above would be the same as "app.php?controller=news/page/2". With this patch that is easily possible. What you do is, you specify the $base_url and $start_name as follows: $base_url = $controller_helper->url('news/page/%d'); $start_name = '/page/%d'; // Part of the url that will be removed // for page 1 Now this will generate: "news" for start = 0 "news/page/1" will work aswell, but will not be created "news/page/2" for start = 10 PHPBB3-11805
* | | | | Merge pull request #1565 from naderman/ticket/11700Nils Adermann2013-09-2545-230/+230
|\ \ \ \ \ | |_|/ / / |/| | | | [WIP][ticket/11700] Namespaces
| * | | | [ticket/11700] Correctly load templates for extensionsNils Adermann2013-09-191-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | [ticket/11700] Correct ucp_auth_link request interface referencesNils Adermann2013-09-191-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | [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-174-112/+39
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | [ticket/11700] Correctly load extensions with nonprefixed namespacesNils Adermann2013-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-1632-263/+2103
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/11700] Get the installer to run with namespacesNils Adermann2013-09-162-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-1643-219/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1418-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
* | | | | | | Merge remote-tracking branch 'fredsa/ticket/11606' into developAndreas Fischer2013-09-231-14/+35
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | * fredsa/ticket/11606: [ticket/11606] remove preg_replace() /e modifier in make_clickable()
| * | | | | | [ticket/11606] remove preg_replace() /e modifier in make_clickable()Fred Sauer2013-06-131-14/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11606
* | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11832' into developJoas Schilling2013-09-164-112/+39
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-133-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | | | [ticket/11832] Fix constructions of phpbb_filesystemNathan Guse2013-09-131-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | | | [ticket/11832] Fix smiley pathsNathan Guse2013-09-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-135-55/+32
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse (22) and others # Via Nathan Guse (10) and others * 'develop' of github.com:phpbb/phpbb3: (39 commits) [ticket/11843] Added newlines and included numbers in the DEFINE vars test [ticket/11843] Add checking DEFINE variables with underscores to template_test [ticket/11843] The twig lexer fixes DEFINE variables with underscores again [ticket/11727] Fix indentation [ticket/11727] Fix indentation [ticket/11745] Correct language, coding guidelines [ticket/11828] Fix greedy operators in lexer [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE [ticket/11833] Fix bad template loop [ticket/11816] !$DOESNT_EXIST test [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [ticket/11816] Test !$DEFINITION [ticket/11822] Use namespace lookup order for asset loading [ticket/11727] Template loader support for safe directories to load files from [ticket/11816] Fix define/loop checks in IF statements containing parenthesis [ticket/11373] Use inheritdoc [ticket/11637] generate_text_for_display on search.php [ticket/11744] Cast to int [ticket/11744] Inheritdoc ...
| * \ \ \ \ \ \ Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ↵Nathan Guse2013-09-121-0/+48
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/11832 * remotes/imkingdavid/ticket/11824: [ticket/11824] Revert changes in functions.php [ticket/11824] Reorganize test file [ticket/11824] Update language string for board settings [ticket/11824] Revert changes to functions_content.php [ticket/11824] Add tests for urls with mod_rewrite enabled [ticket/11824] Correct a comment [ticket/11824] Change copyright year in migration file [ticket/11824] Remove unused globals [ticket/11824] Fix smilies [ticket/11824] Fix logic [ticket/11824] Add option for mod_rewrite
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-09 23:35:28 +0000