aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1938 from prototech/ticket/12077Nathan Guse2014-01-171-3/+3
|\ | | | | [ticket/12077] Ensure that valid upload methods are presented to user in language packs page.
| * [ticket/12077] Fix another strict standards error.Cesar G2013-12-191-2/+2
| | | | | | | | PHPBB3-12077
| * [ticket/12077] Fix strict standards error.Cesar G2013-12-191-1/+1
| | | | | | | | PHPBB3-12077
* | Merge remote-tracking branch 'Marc/ticket/11997' into developJoas Schilling2014-01-081-63/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11997: (23 commits) [ticket/11997] Use functional test cases that should always work [ticket/11997] Fix redirect tests for mod rewrite [ticket/11997] Add user's page dir to redirect path and fix unit tests for it [ticket/11997] Remove obsolete function get_controller_redirect_url() [ticket/11997] Use path_helper in in foo/bar extension for redirect URLs [ticket/11997] Add remove_web_root_path() in order to prevent incorrect URLs [ticket/11997] Do not check if file or dir we redirect to exist [ticket/11997] Modifiy tests after adding path_helper clean_url method [ticket/11997] Add clean_url() method to path_helper [ticket/11997] Allow redirects to parent folders like previously [ticket/11997] Move expected redirect returns to controller and output to HTML [ticket/11997] Fix tests for path_helper's get_controller_redirect_url() [ticket/11997] Use get_controller_redirect_url() in redirect() function [ticket/11997] Add method for controller redirect URLs to path helper [ticket/11997] Undo changes to phpbb_own_realpath() [ticket/11997] Remove obsolete failover_flag in function redirect() [ticket/11997] Add functional test for redirects in controller [ticket/11997] Fix missing global [ticket/11997] Fix redirects from inside controllers [ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect paths ...
| * | [ticket/11997] Add user's page dir to redirect path and fix unit tests for itMarc Alexander2013-12-281-1/+8
| | | | | | | | | | | | | | | | | | | | | The user's page directory needs to be added to the redirect URL for proper redirects outside of the forum root. Fix the unit tests accordingly. PHPBB3-11997
| * | [ticket/11997] Add remove_web_root_path() in order to prevent incorrect URLsMarc Alexander2013-12-271-1/+1
| | | | | | | | | | | | | | | | | | | | | Adding a call to this method to the redirect function will make sure that we do not end up with incorrect URLs after using append_sid(). PHPBB3-11997
| * | [ticket/11997] Do not check if file or dir we redirect to existMarc Alexander2013-12-271-75/+13
| | | | | | | | | | | | | | | | | | | | | | | | The redirect function will now properly redirect to where we want it to. It will no longer try to check if the file or directory we redirect to exist. This will ensure compatibility with the new routes. PHPBB3-11997
| * | [ticket/11997] Add clean_url() method to path_helperMarc Alexander2013-12-211-1/+1
| | | | | | | | | | | | | | | | | | This method will get rid of unnecessary . and .. in URLs. PHPBB3-11997
| * | [ticket/11997] Allow redirects to parent folders like previouslyMarc Alexander2013-12-211-4/+5
| | | | | | | | | | | | | | | | | | | | | Redirects to parent folders were possible with the previous redirect function. This change will allow these redirects again. PHPBB3-11997
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb into ticket/11997Marc Alexander2013-12-0720-220/+263
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tests/functional/fixtures/ext/foo/bar/config/services.yml
| * | | [ticket/11997] Use get_controller_redirect_url() in redirect() functionMarc Alexander2013-12-071-46/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This method of path_helper will now be used instead of the previous hack of the phpbb_own_realpath() function. PHPBB3-11997
| * | | [ticket/11997] Undo changes to phpbb_own_realpath()Marc Alexander2013-12-071-0/+8
| | | | | | | | | | | | | | | | PHPBB3-11997
| * | | [ticket/11997] Remove obsolete failover_flag in function redirect()Marc Alexander2013-11-171-41/+36
| | | | | | | | | | | | | | | | | | | | | | | | This flag is no longer needed as the failover is no longer needed. PHPBB3-11997
| * | | [ticket/11997] Fix missing globalJoas Schilling2013-11-131-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11997
| * | | [ticket/11997] Fix redirects from inside controllersJoas Schilling2013-11-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The redirect url currently uses the web root path. However as we prepend the full board url later, we need to remove the relative web root path and prepend the normal root path again. Otherwise redirects from inside routes will not work as intended. PHPBB3-11997
| * | | [ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect pathsMarc Alexander2013-11-121-11/+4
| | | | | | | | | | | | | | | | PHPBB3-11997
| * | | [ticket/11997] Rename root_dirs_size to superordinate_dirs_countMarc Alexander2013-11-111-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable name better fits what is done with it. A comment explaining why 2 has to be subtracted from the size of root_dirs has also been added PHPBB3-11997
| * | | [ticket/11997] Remove obsolete if statement in phpbb_own_realpath()Marc Alexander2013-11-101-10/+0
| | | | | | | | | | | | | | | | PHPBB3-11997
| * | | [ticket/11997] Correctly redirect to front controllersMarc Alexander2013-11-081-24/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently do a lot of checks in order to prevent users from getting to a 404 page. However, this logic relies on checking if a file or folder exists. Due to the front controllers and the URL rewriting in 3.1, it is no longer possible to rely on existing files for redirecting. This patch will take care of properly redirecting users to front controller files. An incorrect link will cause users to get a 404 error though. PHPBB3-11997
* | | | Merge pull request #1890 from prototech/ticket/12034Nathan Guse2013-12-302-2/+15
|\ \ \ \ | | | | | | | | | | [ticket/12034] AJAXify notifications popup.
| * | | | [ticket/12034] AJAXify notifications popup.Cesar G2013-12-302-2/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-12034
* | | | | Merge pull request #1920 from prototech/ticket/12038Nathan Guse2013-12-305-49/+98
|\ \ \ \ \ | |/ / / / |/| | | | [ticket/12038] AJAXify move up/down buttons for various ACP pages.
| * | | | [ticket/12038] Free query results.Cesar G2013-12-302-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12038
| * | | | [ticket/12038] Do not rely on stale order value to move items.Cesar G2013-12-063-48/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to move the items more than once with AJAX. PHPBB3-12038
| * | | | [ticket/12038] Use $move_executed in place of $db->sql_affectedrows().Cesar G2013-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12038
| * | | | [ticket/12038] AJAXify move up/down buttons in report/denial reasons page.Cesar G2013-12-051-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-12038
| * | | | [ticket/12038] AJAXify move up/down buttons in custom profile fields page.Cesar G2013-12-051-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-12038
| * | | | [ticket/12038] AJAXify move up/down buttons in the permission roles page.Cesar G2013-12-051-0/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-12038
| * | | | [ticket/12038] AJAXify move up/down buttons in the module management pages.Cesar G2013-12-051-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-12038
| * | | | [ticket/12038] AJAXify move up/down buttons in the smilies/topic icons page.Cesar G2013-12-051-0/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-12038
* | | | | Merge pull request #1889 from prototech/ticket/11963Nathan Guse2013-12-302-11/+37
|\ \ \ \ \ | | | | | | | | | | | | [ticket/11963] Remove stale MCP notifications.
| * | | | | [ticket/11963] Fix undefined variable: post_data when mass-approving topics.Cesar G2013-11-231-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11963
| * | | | | [ticket/11963] Delete topic_in_queue notifications in MCP approve_details modeCesar G2013-11-231-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11963
| * | | | | [ticket/11963] Don't depend on user_notify flag to delete report notifications.Cesar G2013-11-231-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11963
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11911' into developDhruv2013-12-271-0/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11911: [ticket/11911] Warn admins when there is no search index for the selected engine
| * | | | | | [ticket/11911] Warn admins when there is no search index for the selected engineJoas Schilling2013-12-271-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11911
* | | | | | | Merge remote-tracking branch 'nickvergessen/feature/pagination-class' into ↵Dhruv2013-12-2520-291/+86
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop # By Joas Schilling # Via Joas Schilling * nickvergessen/feature/pagination-class: [ticket/11849] Fix more function calls [ticket/11849] Update more MCP calls to pagination class [ticket/11849] Update some ACP modules with new pagination [ticket/11849] Update rest of the UCP modules [ticket/11849] Update UCP notifications and pm folder [ticket/11849] Update search and memberlist [ticket/11849] Update pagination in viewonline.php [ticket/11849] Remove old pagination test [ticket/11849] Update pagination code in viewtopic.php [ticket/11849] Replace pagination in viewforum.php with class [ticket/11849] Add service definition [ticket/11849] Remove pagination functions [ticket/11849] Test validate_start and on_page [ticket/11849] Move pagination code to class
| * | | | | | [ticket/11849] Fix more function callsJoas Schilling2013-12-186-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11849
| * | | | | | [ticket/11849] Update more MCP calls to pagination classJoas Schilling2013-12-185-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11849
| * | | | | | [ticket/11849] Update some ACP modules with new paginationJoas Schilling2013-12-183-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11849
| * | | | | | [ticket/11849] Update rest of the UCP modulesJoas Schilling2013-12-183-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11849
| * | | | | | [ticket/11849] Update UCP notifications and pm folderJoas Schilling2013-12-182-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11849
| * | | | | | [ticket/11849] Remove pagination functionsJoas Schilling2013-12-181-219/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functions where changed in 3.1 anyway, so we can just delete them PHPBB3-11849
* | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12060' into developJoas Schilling2013-12-203-23/+152
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12060: (37 commits) [ticket/12060] A little less verbose cleanup of event docblocks [ticket/12060] Further clarifying new event docblocks as much as possible [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event [ticket/12060] Remove whitespaces [ticket/12060] Fix docblock for acp_bbcodes_modify_create event [ticket/12060] Rename event in message parser to modify_format_display_text_after [ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sql [ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block [ticket/12060] Use separate template event for acp user signature posting buttons [ticket/12060] Rename event from append to after in acp_bbcodes.html [ticket/12060] Correctly label alpha versions in event docblocks [ticket/12060] Fix u_action comments in docblocks [ticket/12060] Change @since in event docblocks [ticket/12060] Update the docblock comments in acp core events [ticket/12060] Refactor u_action in the events that use it [ticket/12060] Use $sql_ary instead of $sql [ticket/12060] Update docblock for core event due to addition of another var [ticket/12060] Remove re-tabbing of html from subsilver2 files [ticket/12060] Add $update_this_message var to the core event [ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis ...
| * | | | | [ticket/12060] A little less verbose cleanup of event docblocksMatt Friedman2013-12-171-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| * | | | | [ticket/12060] Further clarifying new event docblocks as much as possibleMatt Friedman2013-12-162-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| * | | | | [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create eventMatt Friedman2013-12-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| * | | | | [ticket/12060] Remove whitespacesMatt Friedman2013-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| * | | | | [ticket/12060] Fix docblock for acp_bbcodes_modify_create eventMatt Friedman2013-12-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12060
| * | | | | [ticket/12060] Rename event in message parser to ↵Matt Friedman2013-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modify_format_display_text_after PHPBB3-12060