aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11465] Use extension finder when adding extensions' acp modulesMarc Alexander2013-03-211-47/+25
| | | | | | | | | | | | | The method acp_modules::get_module_infos() needs to use the extension finder whenever it is looking for a module's info file. While transitioning to the new extension system, only the initial search for all module info files was changed to the new system. Due to this it is not possible to add an extension's acp/mcp/ucp module manually in the ACP. This patch will always use the extension finder for the acp module's info files and therefore properly find the needed file. Additionally, the code has been cleaned up a little bit. PHPBB3-11465
* Merge PR #1298 branch 'nickvergessen/ticket/11438' into developOleg Pudeyev2013-03-202-4/+4
|\ | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11438: [ticket/11438] Add spaces after # comment start and before \ line breaks [ticket/11438] Add helpful comments from sample config to ACP output [ticket/11438] Add empty sql_query_pre to delta-source [ticket/11438] Move backslash to concatenate the query strings correctly [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()
| * [ticket/11438] Add spaces after # comment start and before \ line breaksJoas Schilling2013-03-162-4/+4
| | | | | | | | PHPBB3-11438
| * [ticket/11438] Add helpful comments from sample config to ACP outputJoas Schilling2013-03-151-3/+3
| | | | | | | | PHPBB3-11438
* | Merge remote-tracking branch 'remotes/Marc/ticket/11404' into developNathan Guse2013-03-121-0/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/Marc/ticket/11404: [ticket/11404] Remove version ID from manager_test.php file header [ticket/11404] Add tests for phpbb_avatar_manager::clean_row() [ticket/11404] Convert manager_test to UNIX line endings [ticket/11404] Use a default data row if $row is empty in clean_row() [ticket/11404] Return empty array of avatar data if $row is empty
| * | [ticket/11404] Use a default data row if $row is empty in clean_row()Marc Alexander2013-03-071-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | A statically defined $default_row will be used inside the phpbb_avatar_manager::clean_row() method if the $row passed to it is empty. PHPBB3-11404
| * | [ticket/11404] Return empty array of avatar data if $row is emptyMarc Alexander2013-03-061-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While creating a group in the acp, the group data ($group_row) is empty. Due to that array_combine in phpbb_avatar_manager::clean_row() will cause PHP Warnings. In addition to that the required indexes 'avatar', 'avatar_width', 'avatar_height', and 'avatar_type' won't be defined. This patch will solve that issue. PHPBB3-11404
* | | [ticket/11310] Add hashes to action links to prevent CSRF attacksJoas Schilling2013-03-121-6/+15
| |/ |/| | | | | PHPBB3-11310
* | Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into developNathaniel Guse2013-03-091-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Dhruv * remotes/dhruv/ticket/11303: [ticket/11303] rename attribute to timezone-preselect [ticket/11303] remove additional brackets [ticket/11303] use S_TZ_PRESELECT in subsilver [ticket/11303] add S_TZ_PRESELECT template var
| * | [ticket/11303] remove additional bracketsDhruv2013-02-121-1/+1
| | | | | | | | | | | | PHPBB3-11303
| * | [ticket/11303] add S_TZ_PRESELECT template varDhruv2013-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | add a new template variable to check if timezone has already been selected by the user while registeration. PHPBB3-11303
* | | Merge remote-tracking branch 'remotes/marc/ticket/11323' into developNathaniel Guse2013-03-091-1/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/marc/ticket/11323: [ticket/11323] Reduce additional code and revert regex to previous one [ticket/11323] Enable tests for inclusion of defined variables [ticket/11323] Correctly treat variables in template defines
| * | | [ticket/11323] Reduce additional code and revert regex to previous oneMarc Alexander2013-02-261-7/+12
| | | | | | | | | | | | | | | | PHPBB3-11323
| * | | [ticket/11323] Correctly treat variables in template definesMarc Alexander2013-02-191-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, any template variables that were used when defining a variable were treated as strings. This is a regression to phpBB 3.0. With this patch the template variables will be properly parsed. PHPBB3-11323
* | | | Merge remote-tracking branch 'remotes/Blitze/ticket/11383' into developNathaniel Guse2013-03-091-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By OpenShift guest # Via OpenShift guest * remotes/Blitze/ticket/11383: [ticket/11383] Correctly revert modules added/removed by migrator
| * | | | [ticket/11383] Correctly revert modules added/removed by migratorOpenShift guest2013-03-031-0/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11383
* | | | | [ticket/11423] Send unformatted usernames to the email templateNathaniel Guse2013-03-092-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11423
* | | | | Merge remote-tracking branch 'EXreaction/ticket/11408' into developDavid King2013-03-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11408: [ticket/11408] user_jabber instead of jabber
| * | | | | [ticket/11408] user_jabber instead of jabberNathaniel Guse2013-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11408
* | | | | | Merge remote-tracking branch 'remotes/bantu/ticket/10202' into developNathan Guse2013-03-062-0/+208
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * remotes/bantu/ticket/10202: [ticket/10202] Rename method names _all() to _array(). [ticket/10202] Add migration file for config_db_text. [ticket/10202] Upgrade TEXT to the bigger MTEXT. [ticket/10202] Improve method documentation. [ticket/10202] SQL escape the table name. [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries. [ticket/10202] Define phpbb_config_db_text as a service. [ticket/10202] Add tests for phpbb_config_db_text. [ticket/10202] Adjust method names to guidelines. [ticket/10202] Add database schema for phpbb_config_db_text. [ticket/10202] Implementation of config options with arbitrary length values.
| * | | | | | [ticket/10202] Rename method names _all() to _array().Andreas Fischer2013-03-051-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | | [ticket/10202] Add migration file for config_db_text.Andreas Fischer2013-03-051-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | | [ticket/10202] Improve method documentation.Andreas Fischer2013-03-051-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | | [ticket/10202] SQL escape the table name.Andreas Fischer2013-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | | [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.Andreas Fischer2013-03-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | | [ticket/10202] Adjust method names to guidelines.Andreas Fischer2013-03-051-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10202
| * | | | | | [ticket/10202] Implementation of config options with arbitrary length values.Andreas Fischer2013-03-051-0/+157
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | PHPBB3-10202
* | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166Joas Schilling2013-03-06159-3799/+17693
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (799 commits) [ticket/11402] Fix undefined index in post/topic_in_queue [ticket/11400] If email is disabled, disable it for notifications [ticket/11398] Correctly call permission_set method in permission tool [ticket/11394] Relax Migration Tools [ticket/11386] Fix missing ; [ticket/10714] Get log from container in install, update and download/file [feature/avatars] Update module_auth of ucp module and fix small issues [ticket/11396] Rename insert_migration to set_migration_state [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files [ticket/11393] Give more information on database updater [ticket/11386] Send list of migrations instead of using load_migrations [feature/avatars] Add migrations data file for avatars [feature/avatars] Reduce module auth of ucp avatar settings [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/ [ticket/10714] Logs are disabled for this page call only [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working ... Conflicts: phpBB/assets/javascript/core.js
| * | | | | Merge remote-tracking branch 'EXreaction/ticket/11400' into developDavid King2013-03-051-2/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse # Via Nathan Guse * EXreaction/ticket/11400: [ticket/11400] If email is disabled, disable it for notifications
| | * | | | | [ticket/11400] If email is disabled, disable it for notificationsNathan Guse2013-03-051-2/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-11400
| * | | | | [ticket/11402] Fix undefined index in post/topic_in_queueNathan Guse2013-03-052-8/+35
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11402
| * | | | Merge remote-tracking branch 'remotes/marc/ticket/11398' into developNathaniel Guse2013-03-041-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/marc/ticket/11398: [ticket/11398] Correctly call permission_set method in permission tool
| | * | | | [ticket/11398] Correctly call permission_set method in permission toolMarc Alexander2013-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The permission_set method calls itself inside the permission tool. Probably due to an oversight, it is called as $this->set(), which causes a fatal error. This patch will get rid of this issue. PHPBB3-11398
| * | | | | Merge remote-tracking branch 'remotes/nickv/ticket/10714' into developNathaniel Guse2013-03-046-310/+897
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/10714: (56 commits) [ticket/10714] Get log from container in install, update and download/file [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/ [ticket/10714] Logs are disabled for this page call only [ticket/10714] Update add_log docs block with @param and @deprecated [ticket/10714] Remove fallback code from previous commits and move global [ticket/10714] Fix missing parameter and global phpbb_log in unit tests [ticket/10714] Add getter for is_in_admin and use it [ticket/10714] Fix more comments [ticket/10714] Cast values to integer before using them in the query [ticket/10714] Fix several doc blocks and comments [ticket/10714] Fix missing 8th argument in unit tests [ticket/10714] Use new core.adm_relative_path to create the object. [ticket/10714] Fix several comments and variable names [ticket/10714] Fix database driver class name [ticket/10714] Forgot most important, use container to create $phpbb_log [ticket/10714] Remove type hinting to allow the usage of mocks in tests [ticket/10714] Fix dependency injections in unit tests with mocks [ticket/10714] Use dependencies instead of globals [ticket/10714] Compare log_type to false, rather then null [ticket/10714] Add global variables for the unit tests ...
| | * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-03-0485-569/+8956
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (255 commits) [ticket/6723] Show info that message has been deleted before delivery [ticket/11385] Fix issue with migration module tool not getting extension module info [ticket/11386] Fix failing tests from constructor changes [ticket/11386] Fix circular reference error & serialize error [ticket/11386] Remove tests that check if finder cache is working [ticket/11386] Forgot to get the migration classes [ticket/11386] Update tests with new constructors for ext.manager/migrator [ticket/11386] Use finder to find migration files [ticket/11363] Fix to make get_module_infos get from all extensions [ticket/11381] Make finder able to search in all available extensions [ticket/11103] Revert whitespace changes [ticket/11103] Few more minor language things [ticket/11103] Don't call generate_board_url many times [ticket/11103] Case time in queries as an int [ticket/11103] Fix effectively installed check [ticket/11103] Remove padding from notifications for now. [ticket/11363] Fix a couple bugs and throw errors if the file not found [ticket/11372] Migrator should only check if effectively installed if not [ticket/11363] Load module info files for extensions too [ticket/11103] Notifications Migration file ... Conflicts: phpBB/config/services.yml phpBB/config/tables.yml
| | * | | | [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/Joas Schilling2013-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | [ticket/10714] Logs are disabled for this page call onlyJoas Schilling2013-03-032-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-02-2530-79/+2744
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (119 commits) [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated [ticket/11358] Changed the name of post parameter. [ticket/11358] Changed the action parameter value to represent the link. [ticket/11358] Enabled link making all users default for a group. [ticket/11358] Removed redundant code and referred proper variable. [ticket/11358] Success message even without selecting a user. [ticket/11355] Referred proper variable when validating selection. [ticket/11355] Wrong error message when no user is selected. [ticket/10896] Add missing email validation lost in develop merge [ticket/7262] Add note about set_config() not updating is_dynamic. [ticket/7262] Add $is_dynamic example to set_config() and set_config_count(). [ticket/7262] Backport set_config() and set_config_count() docs from develop. [ticket/11122] Move rxu to 'Former Contributors' section. [ticket/11122] Add EXreaction to docs/AUTHORS. [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION [ticket/11361] Make sure that array passed to strtr() has the proper format. [ticket/11179] remove extra & in function call [ticket/11179] correct start parameter in sphinx search [ticket/11179] correct start parameter in native author search [ticket/11179] correct start parameter in native keyword search ... Conflicts: phpBB/config/tables.yml
| | * | | | | [ticket/10714] Update add_log docs block with @param and @deprecatedJoas Schilling2013-02-251-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | [ticket/10714] Remove fallback code from previous commits and move globalJoas Schilling2013-01-231-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | [ticket/10714] Fix missing parameter and global phpbb_log in unit testsJoas Schilling2013-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-01-223-33/+62
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: [ticket/11329] Moving colors to colours.css [ticket/9492] Fix missing phpbb_container in unit tests [ticket/9492] Fix typo in SQL query [ticket/9492] Ensure to delete the avatar/rank data when we change it [ticket/9492] Ensure to update all avatar values when the avatar is changed [ticket/9492] Fix undefined user_avatar_* values when updating the group avatar [ticket/9492] Add unit tests for custom ranks and avatars [ticket/9492] Retain custom ranks and avatars when setting users default group [ticket/11328] Replace long buttons text with short text [ticket/11328] Add language variables for buttons
| | * | | | | | [ticket/10714] Add getter for is_in_admin and use itJoas Schilling2013-01-221-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | [ticket/10714] Fix more commentsJoas Schilling2013-01-221-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | [ticket/10714] Cast values to integer before using them in the queryJoas Schilling2013-01-221-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | [ticket/10714] Fix several doc blocks and commentsJoas Schilling2013-01-223-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | [ticket/10714] Use new core.adm_relative_path to create the object.Joas Schilling2013-01-161-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714Joas Schilling2013-01-1651-1974/+2308
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of https://github.com/phpbb/phpbb3: (205 commits) [ticket/10786] Javascript toggle member search panel in memberlist.php [ticket/10786] Javascript toggle member search panel in memberlist.php [ticket/10786] Javascript toggle member search panel in memberlist.php [ticket/11201] Remove database column on update [ticket/10431] Remove .left class from reply-all [ticket/10431] Remove reply-all custom css [ticket/10431] Adjustments for large buttons [ticket/11323] Add tests for inclusion of defined variables [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail. [ticket/11201] Remove MSN/WLM fields [ticket/11321] Recreate schema files with develop/create_schema_files.php [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31 [ticket/11313] Use correct object el instead of eel in alt_text callback [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4. [ticket/11311] Include asset core.js in subsilver2 overall_footer.html [ticket/10949] Remove not needed comma [ticket/11309] phpbb_extension_interface::disable_step correct docblock. [ticket/10949] Converted missing code to new JS coding guidelines [ticket/11302] Correctly select first timezone or selected timezone ...
| | * | | | | | | [ticket/10714] Fix several comments and variable namesJoas Schilling2013-01-162-53/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
| | * | | | | | | [ticket/10714] Fix database driver class nameJoas Schilling2012-12-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10714
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 03:51:12 +0000