aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/bbcode.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-091-1/+21
|\ | | | | | | | | Conflicts: phpBB/includes/bbcode.php
| * [ticket/13478] Add event core.bbcode_cache_init_endOliver Schramm2015-01-081-1/+21
| | | | | | | | PHPBB3-13478
* | [ticket/12957] Update the constructions of the template engineTristan Darricau2014-08-101-2/+19
|/ | | | PHPBB3-12957
* [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-271-4/+7
| | | | PHPBB3-12594
* [ticket/11962] Resize posted images to fit and give them a classMatt Friedman2014-03-301-1/+1
| | | | PHPBB3-11962
* Merge branch 'develop-olympus' into developJoas Schilling2013-12-021-2/+2
|\ | | | | | | | | * develop-olympus: [ticket/12048] Fix the regexp for language keys in custom bbcodes.
| * [ticket/12048] Fix the regexp for language keys in custom bbcodes.Cesar G2013-12-021-2/+2
| | | | | | | | PHPBB3-12048
* | [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-261-2/+2
| | | | | | | | PHPBB3-11852
* | [ticket/11865] Convert old class name to namespaced versionJoas Schilling2013-09-261-1/+1
| | | | | | | | PHPBB3-11865
* | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-171-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-131-2/+2
| | | | | | | | | | | | PHPBB3-11832
* | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-161-5/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/11628] Remove phpbb_style (move methods to phpbb_template)Nathaniel Guse2013-07-241-2/+1
| | | | | | | | | | | | PHPBB3-11628
| * | [ticket/11628] Remove style path providerNathaniel Guse2013-07-241-2/+1
| | | | | | | | | | | | | | | | | | No longer used since Twig was implemented. PHPBB3-11628
| * | [ticket/11628] Remove style resource locatorNathaniel Guse2013-07-241-2/+1
| | | | | | | | | | | | | | | | | | No longer used since Twig was implemented. PHPBB3-11628
* | | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-161-4/+4
|/ / | | | | | | PHPBB3-11700
* | [feature/twig] Fix BBCode parserNathaniel Guse2013-07-021-1/+1
| | | | | | | | PHPBB3-11598
* | [feature/twig] Remove resource locator dependency from templateNathaniel Guse2013-07-011-1/+1
| | | | | | | | PHPBB3-11598
* | [feature/twig] Use phpbb_template_twig in testsNathan Guse2013-06-121-1/+1
| | | | | | | | | | | | Replace all new phpbb_template( with new phpbb_template_twig( PHPBB3-11598
* | [ticket/10844] Add phpbb_root_path to phpbb_style_extension_path_providerJoas Schilling2013-04-121-1/+1
| | | | | | | | | | | | | | | | The phpbb_root_path needs to be removed from the style path, before giving the path to the finder, because the finder prepends it later again and is therefor unable to find style files when the root path is not ./ PHPBB3-10844
* | [feature/template-events] Inject extension manager into template class.Oleg Pudeyev2012-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Template class passes extension manager to template compiler. Template compiler passes extension manager to template filter. Template filter will use extension manager to locate hooks as it is compiling templates. All extension manager arguments are optional. If an extension manager is not given, template hooks will not be invoked. PHPBB3-9550
* | [ticket/10933] Dependency inject template context.Oleg Pudeyev2012-11-021-1/+1
| | | | | | | | PHPBB3-10933
* | [ticket/10743] Renaming user->themeVjacheslav Trushkin2012-06-111-1/+1
| | | | | | | | | | | | Renaming user->theme to user->style PHPBB3-10743
* | [ticket/10756] Renaming phpbb_style_template to phpbb_templateVjacheslav Trushkin2012-04-191-1/+1
| | | | | | | | | | | | Renaming phpbb_style_template to phpbb_template PHPBB3-10756
* | [ticket/10756] Removing path provider from template classVjacheslav Trushkin2012-04-191-1/+1
| | | | | | | | | | | | Removing path provider from template class because it is not used by template class PHPBB3-10756
* | [feature/merging-style-components] Moving template initialization out of styleVjacheslav Trushkin2012-03-311-2/+2
| | | | | | | | | | | | Moving template initialization out of style constructor PHPBB3-10632
* | [feature/merging-style-components] Initializing locator and provider separatelyVjacheslav Trushkin2012-03-311-2/+4
| | | | | | | | | | | | Moving locator and path provider initialization out of style class PHPBB3-10632
* | [feature/merging-style-components] Updating style initializationVjacheslav Trushkin2012-03-151-1/+1
| | | | | | | | | | | | Changing template initialization to style initialization. PHPBB3-10632
* | [feature/merging-style-components] Creating style classVjacheslav Trushkin2012-03-151-5/+4
| | | | | | | | | | | | Creating phpbb_style class, changing template initialization to style initialization PHPBB3-10632
* | [feature/merging-style-components] Renaming template classesVjacheslav Trushkin2012-03-141-3/+3
| | | | | | | | | | | | Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates) PHPBB3-10632
* | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
| | | | | | | | PHPBB3-9916
* | [feature/extension-manager] Refactoring the structure of extension providerNils Adermann2011-09-291-1/+1
| | | | | | | | PHPBB3-10323
* | [feature/extension-manager] Add support for templates in extensions.Nils Adermann2011-09-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a template path provider to separate the process of locating (cached) paths in extensions from the template engine. The locator is supplied with a list of paths from the path provider. Admin templates can now be created in ext/<ext>/adm/style/ and regular templates go into ext/<ext>/styles/<style>/template/. Extension templates override regular templates. So if an extension supplies a file with a name used in phpBB, the extension's file will be used. A side-effect of this commit: Locator and Provider are now able to deal with arbitrary levels of template inheritance. So we can expose this through phpbb_template if we choose to, and allow styles to inherit from inherited styles. PHPBB3-10323
* | Merge remote-tracking branch 'github-p/feature/template-engine' into developNils Adermann2011-08-131-18/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/feature/template-engine: (87 commits) [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [feature/template-engine] Need to call set_template on template. [feature/template-engine] Update installer for template engine changes. [feature/template-engine] Dependency inject locator into template. [feature/template-engine] Delete useless code from set_template. [feature/template-engine] Delete no longer used $template_filename property. [feature/template-engine] Delete useless $template globalization. [feature/template-engine] Use template engine class in bbcode class. [feature/template-engine] Corrected an error message in template locator. [feature/template-engine] Remaining documentation. [feature/template-engine] More documentation for template class. [feature/template-engine] Create load_and_render to reduce code duplication. [feature/template-engine] Get rid of orig_tpl_* in template engine. [feature/template-engine] Delete $style_name param from locator's set_custom_template. [feature/template-engine] Add constructor to template locator. [feature/template-engine] Factor template locator out of template class. [feature/template-engine] Delete $files_template property. [feature/template-engine] Rename is_absolute to phpbb_is_absolute. [feature/template-engine] Test template DEFINE statements across files ... Conflicts: .gitignore phpBB/includes/template.php
| * | [feature/template-engine] Clean up template locator usage in bbcode.Oleg Pudeyev2011-08-131-3/+2
| | | | | | | | | | | | PHPBB3-9726
| * | [feature/template-engine] Dependency inject locator into template.Oleg Pudeyev2011-08-091-1/+2
| | | | | | | | | | | | PHPBB3-9726
| * | [feature/template-engine] Delete no longer used $template_filename property.Oleg Pudeyev2011-08-091-1/+0
| | | | | | | | | | | | PHPBB3-9726
| * | [feature/template-engine] Delete useless $template globalization.Oleg Pudeyev2011-08-091-1/+1
| | | | | | | | | | | | PHPBB3-9726
| * | [feature/template-engine] Use template engine class in bbcode class.Oleg Pudeyev2011-08-071-17/+6
| | | | | | | | | | | | PHPBB3-9726
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-071-0/+7
|\ \ \ | |/ / |/| / | |/ | | * develop-olympus: [ticket/8937] Keep space characters in front of [code] bbcode content
| * [ticket/8937] Keep space characters in front of [code] bbcode contentNils Adermann2011-07-171-0/+7
| | | | | | | | PHPBB3-8937
* | [ticket/9556] Drop php closing tags, add trailing newlineIgor Wiedler2010-11-111-2/+0
|/ | | | | | | | | | | | Closing tags converted using Oleg's script. remove-php-end-tags.py -a . Trailing newlines added using the following where $ext is file extension. find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s; Extensions: php, css, html, js, xml. PHPBB3-9556
* Enter stage left: the INTTEXT tokenHenry Sudhof2010-02-211-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10516 89ea8834-ac86-4346-8a33-228a782c2dd0
* BBCode parser now uses the user object for all settings rather than taking ↵Nils Adermann2010-02-211-1/+1
| | | | | | some from the template object [Bug #57365] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10515 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix #51285 and more issues with template inherence on set_custom_templateJoas Schilling2009-09-161-2/+2
| | | | | | | | Conflict introduced with r9839 and r9823 Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10150 89ea8834-ac86-4346-8a33-228a782c2dd0
* Color bbcode now supports three-digit hex notation. (Bug #39965 - Patch by ↵Meik Sievertsen2009-07-071-1/+1
| | | | | | leviatan21) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9722 89ea8834-ac86-4346-8a33-228a782c2dd0
* change arabic-numbers list-style-type to correct type decimal (Bug #30775)Meik Sievertsen2009-04-171-4/+4
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9461 89ea8834-ac86-4346-8a33-228a782c2dd0
* revert r8893 - there were massive problems with the display and select all codeMeik Sievertsen2008-09-281-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8953 89ea8834-ac86-4346-8a33-228a782c2dd0
* support tabs in code selections (Bug #25445). Still does not solve the ↵Meik Sievertsen2008-09-191-2/+2
| | | | | | strange "4 spaces prefixed on every line" problem in firefox. :/ git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8893 89ea8834-ac86-4346-8a33-228a782c2dd0
* Okay. Frozen, we never said anything about it being permafrost. Also, this ↵Henry Sudhof2008-07-281-2/+13
| | | | | | is not 100% tested, expect troubel with store_db (I'm waiting for the bug reports) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8697 89ea8834-ac86-4346-8a33-228a782c2dd0
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-19 09:09:08 +0000