aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [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
* | | | | | [feature/twig] Fix begin loops & subloopsNathaniel Guse2013-06-152-43/+52
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Throw exceptions (don't catch and ignore)Nathaniel Guse2013-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Add && and || supportNathaniel Guse2013-06-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Use twig loader filesystem with namespaces to add pathsNathaniel Guse2013-06-143-11/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Twig now handles loading style files on its own PHPBB3-11598
* | | | | | [feature/twig] Use phpbb_template_twig in testsNathan Guse2013-06-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace all new phpbb_template( with new phpbb_template_twig( PHPBB3-11598
* | | | | | [feature/twig] Use phpBB's resource locator to find templatesNathan Guse2013-06-122-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Some additional operators, more stuff for IFNathan Guse2013-06-125-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Correcting output of INCLUDEJSNathan Guse2013-06-122-57/+27
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Fixing IF .blah correctlyNathan Guse2013-06-112-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Language output assignments, using context class againNathan Guse2013-06-112-33/+63
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Replace phpBB template with TwigNathan Guse2013-06-103-395/+897
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move phpbb_template class to phpbb_template_phpbb Changed phpbb_template class to an interface Switch services.yml to load phpbb_template_twig instead of phpbb_template PHPBB3-11598
* | | | | | [feature/twig] BEGIN loops now workNathan Guse2013-06-102-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Replace phpBB template code with Twig syntax, then parse w/TwigNathan Guse2013-06-106-67/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing begin token/node, adding includejs token/node PHPBB3-11598
* | | | | | [feature/twig] More work on the lexerNathan Guse2013-06-103-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Committing what I have now to save it as I'm trying another method next PHPBB3-11598
* | | | | | [feature/twig] Working on DEFINENathan Guse2013-06-103-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
* | | | | | [feature/twig] Support our old INCLUDE statements (no quotes)Nathan Guse2013-06-091-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better code for handling IF .blah PHPBB3-11598
* | | | | | [feature/twig] WIP extension/lexer/some tokenparsers/nodesNathan Guse2013-06-097-0/+395
| |_|/ / / |/| | | | | | | | | | | | | | PHPBB3-11598
* | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11481' into developNathan Guse2013-06-0712-0/+1434
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11481: [ticket/11481] Move prepended slash from calls into function [ticket/11481] Remove globals and use dependency injection instead [ticket/11481] Use container for all classes and inject dependencies [ticket/11481] Move functions from feed into helper class [ticket/11481] Move active topics feed to own file [ticket/11481] Move topics feed to own file [ticket/11481] Move news feed to own file [ticket/11481] Move forums feed to own file [ticket/11481] Move topic feed to own file [ticket/11481] Move forum feed to own file [ticket/11481] Move overall feed to own file [ticket/11481] Move feed topic base to own file [ticket/11481] Move feed post base to own file [ticket/11481] Move feed base to own file [ticket/11481] Move feed factory to own file
| * | | | | [ticket/11481] Move prepended slash from calls into functionJoas Schilling2013-06-065-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | | [ticket/11481] Remove globals and use dependency injection insteadJoas Schilling2013-06-0611-125/+115
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | | [ticket/11481] Use container for all classes and inject dependenciesJoas Schilling2013-06-067-33/+81
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | | [ticket/11481] Move functions from feed into helper classJoas Schilling2013-06-061-0/+159
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | | [ticket/11481] Move active topics feed to own fileJoas Schilling2013-06-061-0/+139
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | | [ticket/11481] Move topics feed to own fileJoas Schilling2013-06-061-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11481
| * | | | | [ticket/11481] Move news feed to own fileJoas Schilling2013-06-061-0/+115
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11481
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 19:45:30 +0000