aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [feature/twig] Add addslashes filter (to use on LA_ instead of escape)Nathaniel Guse2013-07-012-2/+3
| | | | | | To match previous parser behavior PHPBB3-11598
* [feature/twig] Remove the get_rootref and get_tpldata functions prev addedNathaniel Guse2013-07-012-24/+3
| | | | | | These are not really necessary PHPBB3-11598
* [feature/twig] Transform {L_, {LA_ to use the lang() functionNathaniel Guse2013-07-013-16/+47
| | | | PHPBB3-11598
* [feature/twig] Fixing include nodeNathaniel Guse2013-07-011-17/+19
| | | | PHPBB3-11598
* [feature/twig] Fixing define nodeNathaniel Guse2013-07-011-3/+3
| | | | PHPBB3-11598
* [feature/twig] Fixing div by replacementNathaniel Guse2013-07-011-3/+3
| | | | PHPBB3-11598
* [feature/twig] Adding ! operatorNathaniel Guse2013-07-011-5/+7
| | | | PHPBB3-11598
* [feature/twig] Add S_NUM_ROWS to loops in contextNathaniel Guse2013-06-291-0/+5
| | | | PHPBB3-11598
* [feature/twig] Adding some operators to the extensionNathaniel Guse2013-06-291-3/+7
| | | | PHPBB3-11598
* [feature/twig] Fixing more stuff for DEFINE/INCLUDENathaniel Guse2013-06-292-9/+44
| | | | PHPBB3-11598
* [feature/twig] Fixing DEFINE statementsNathaniel Guse2013-06-295-33/+196
| | | | PHPBB3-11598
* [feature/twig] New Twig filter, subsetNathaniel Guse2013-06-282-5/+46
| | | | | | | This filter grabs a subset of a loop for output (according to past functionality). PHPBB3-11598
* [feature/twig] Replace BEGIN with Twig for using LexerNathaniel Guse2013-06-265-213/+83
| | | | | | | | | | | No longer using the begin tokenparser/node as it did not allow proper handling of <!-- BEGIN !foo, <!-- BEGIN foo(0,2). Now the lexer will use regular expressions to handle that correctly and replace it with Twig's for token Also fixing <!-- IF .foo as I discovered it evaluates to if sizeof(foo) PHPBB3-11598
* [feature/twig] Set S_ROW_NUM in context also (previously was a hack in filter)Nathaniel Guse2013-06-261-4/+4
| | | | PHPBB3-11598
* [feature/twig] Fix alter_block_array to correctly set S_ROW_COUNTNathaniel Guse2013-06-261-0/+3
| | | | PHPBB3-11598
* [feature/twig] Forgot to set up $config in node/php.phpNathaniel Guse2013-06-251-0/+2
| | | | PHPBB3-11598
* [feature/twig] Going back to Twig's handling of cache file names for nowNathaniel Guse2013-06-251-3/+15
| | | | | | My method was not working correctly, will work on it more later. PHPBB3-11598
* [feature/twig] No longer using the phpbb_template_locatorNathaniel Guse2013-06-251-23/+33
| | | | | | This functionality is handled by the Twig Filesystem Loader PHPBB3-11598
* [feature/twig] Don't require phpbb_config, some tests pass nullNathaniel Guse2013-06-251-1/+1
| | | | PHPBB3-11598
* [feature/twig] INCLUDEPHP token abs paths & fix testNathaniel Guse2013-06-251-3/+11
| | | | PHPBB3-11598
* [feature/twig] INCLUDEPHP token, replace variable usage with $contextNathaniel Guse2013-06-251-3/+6
| | | | | | I could find no better way to do this... PHPBB3-11598
* [feature/twig] INCLUDEPHP token supportNathaniel Guse2013-06-253-0/+114
| | | | PHPBB3-11598
* [feature/twig] Add a comment to tpl output if PHP used, but disabledNathaniel Guse2013-06-251-4/+8
| | | | PHPBB3-11598
* [feature/twig] Pass parameters required to twig env via constructorNathaniel Guse2013-06-252-43/+36
| | | | | | Instead of creating set functions PHPBB3-11598
* [feature/twig] PHP token supportNathaniel Guse2013-06-254-0/+89
| | | | PHPBB3-11598
* [feature/twig] Append assets_version to includejs tagNathaniel Guse2013-06-245-12/+49
| | | | | | Some fixes for main template parser PHPBB3-11598
* [feature/twig] Working on fixing testsNathan Guse2013-06-244-31/+69
| | | | PHPBB3-11598
* Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twigNathan Guse2013-06-246-15/+36
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv (35) and others # Via Andreas Fischer (15) and others * 'develop' of github.com:phpbb/phpbb3: (75 commits) [ticket/10776] update min php version 5.3.3 in readme [ticket/11503] similar implementation for mssql_native and odbc [ticket/11603] Fix out dated comment [ticket/11603] Fix usage note [ticket/11604] Skip installer step where config.php is created. [ticket/11603] Throw RuntimeExceptions instead of using exit() [ticket/11603] Avoid using cURL [ticket/11604] Fix case where config.php is not generated by phpBB. [ticket/11604] Use variables for config.php filesnames. [ticket/11561] Specify used tables in notification fixture, so they are emptied [ticket/11094] Add textbox for jabber while memberlist search [ticket/10820] fix if condition to check for IE [ticket/11603] Split api_request into two functions (query only vs. full url) [ticket/11603] Fix spacing and add some comments [ticket/10820] Add additional check for IE in condition [ticket/11603] Fix github API calls [ticket/11603] Rename network to forks and fix handling [ticket/11603] Fix github api url and use curl with valid user agent [ticket/10820] Fix function docblock [ticket/10820] Inject IE version in function ...
| * [ticket/11503] similar implementation for mssql_native and odbcDhruv2013-06-202-6/+6
| | | | | | | | | | | | | | mssql_native and mssql_odbc db drivers varied at some places where they should have been similar. PHPBB3-11503
| * Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-141-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | * ticket/10820: [ticket/10820] fix if condition to check for IE Conflicts: phpBB/download/file.php
| * \ Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-131-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv (13) and riadhchtara (1) * ticket/10820: [ticket/10820] Add additional check for IE in condition [ticket/10820] Fix function docblock [ticket/10820] Inject IE version in function [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7 [ticket/10820] remove unnecessary parentheses [ticket/10820] fix docblock [ticket/10820] add param and return to function [ticket/10820] simplify regex and escape dot [ticket/10820] Use singular return [ticket/10820] remove unnecessary condition checks [ticket/10820] add function docblock [ticket/10820] fix IE check function [ticket/10820] proper usage of global and local variable browser [ticket/10820] Image downloader recognize new version of ie When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8 Conflicts: phpBB/download/file.php
| * | Merge branch 'develop' into ticket/10820-developDhruv2013-06-131-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander (10) and Joas Schilling (2) # Via Andreas Fischer (3) and Joas Schilling (1) * develop: [ticket/11605] Remove unused copied_files property [ticket/11605] Use empty_dir to better delete files and dirs of extensions [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data()
| | * \ Merge branch 'develop-olympus' into developAndreas Fischer2013-06-111-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data() Conflicts: tests/mock/cache.php
| | | * Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympusAndreas Fischer2013-06-111-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11579: [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data()
| | | | * [ticket/11579] Remove unnecessary globals from validate_password()Marc Alexander2013-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The globals $db and $user are not used in that function. PHPBB3-11579
| * | | | Merge branch 'develop' into ticket/10820-developDhruv2013-06-1358-487/+3429
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (146) and others # Via Andreas Fischer (50) and others * develop: (356 commits) [ticket/11599] Copy the forums into a static array for later reuse [ticket/11602] Do not call localize_errors() if avatars are disabled [ticket/11601] Add protected method for database sync and call it [ticket/11601] Split post_setup_synchronisation logic from xml parsing [ticket/11550] Specify a valid path so it's clearer that it must be a path [ticket/11550] Move comments to correct function [ticket/11550] We use a different fixture set for extension_acp_test.php [ticket/11550] Fixtures should only be directories not files [ticket/11550] Use new functionality from the test case helpers [ticket/11550] Move functionality for copying/restoring to test case helpers [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php [ticket/11543] Add more users so #hidden <> #normal [ticket/11590] Close database connections when tearDown() is called [ticket/develop/11543] Use plurals in develop [ticket/11543] Use correct IP addresses and inject time for correct values [ticket/11543] Add unit tests for obtain_users_online_string() [ticket/11543] Add unit tests for obtain_users_online() with empty forum [ticket/11543] Add unit tests for obtain_users_online() [ticket/11543] Add unit tests for obtain_guest_count() [ticket/11481] Move prepended slash from calls into function ...
| | * | | [ticket/11602] Do not call localize_errors() if avatars are disabledMarc Alexander2013-06-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The avatar manager's method localize_errors() shouldn't be called if avatars are disabled in the config. PHPBB3-11602
| * | | | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-081-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10820: [ticket/10820] Fix function docblock Conflicts: phpBB/download/file.php
| * \ \ \ \ Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-051-7/+8
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10820: [ticket/10820] Inject IE version in function Conflicts: phpBB/download/file.php
| * | | | | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-05-121-1/+9
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10820: [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7 Conflicts: phpBB/download/file.php
| * | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/10820' into ↵Andreas Fischer2013-04-271-6/+18
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/10820-develop * dhruvgoel92/ticket/10820: [ticket/10820] remove unnecessary parentheses [ticket/10820] fix docblock [ticket/10820] add param and return to function [ticket/10820] simplify regex and escape dot [ticket/10820] Use singular return [ticket/10820] remove unnecessary condition checks [ticket/10820] add function docblock [ticket/10820] fix IE check function [ticket/10820] proper usage of global and local variable browser [ticket/10820] Image downloader recognize new version of ie Conflicts: phpBB/download/file.php
* | | | | | [feature/twig] Only set extensions if extension manager is loadedNathan Guse2013-06-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Fixing file header copyrightsNathan Guse2013-06-245-105/+35
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Changing INCLUDEJS behaviorNathan Guse2013-06-242-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was: <!-- INCLUDEJS template/foo.js --> Now: <!-- INCLUDEJS T_TEMPLATE_PATH ~ '/foo.js' --> Reasons for this: 1. INCLUDEJS is 3.1-dev only 2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path to styles/name/ directory) 3. INCLUDEJS could not include files from outside directories or anywhere else 4. It was easier to change INCLUDEJS behavior to something more flexible and useful than hack around it to make it work as it was with Twig. PHPBB3-11598
* | | | | | [feature/twig] Fix <!-- .blah since the being node was changedNathan Guse2013-06-242-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Able to set chain of namespaces to search for loadTemplate()Nathan Guse2013-06-244-3/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done so that when event template files are included, if they include files themselves, that namespace is checked first, then __main__ is checked to include the correct template file. Also, when template files are included from a particular namespace, this is done so that the files from that namespace are included first, then the main namespace is checked. We may want to change this behavior in the future to allow choosing which locations have priority, but for now, this is what I am doing to make sure the behavior is simple and always the same. PHPBB3-11598
* | | | | | [feature/twig] Use twig->display rather than echo twig->renderNathan Guse2013-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Event template tagNathan Guse2013-06-244-40/+97
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Changing method for begin node to not use anonymous functionNathan Guse2013-06-233-3/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way it was setup would actually require PHP 5.4, which isn't an option right now. Leaving the old code there, just commented out, for now at least. PHPBB3-11598
* | | | | | [feature/twig] Setup the style chain/loader properlyNathaniel Guse2013-06-181-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 06:59:49 +0000