aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1716 from marc1706/feature/passwordsNils Adermann2014-02-021-181/+17
|\ | | | | [feature/passwords] Add password hashing manager with support for newer hashing algorithms
| * [feature/passwords] Correct docblock of phpbb_hash() functionMarc Alexander2013-12-291-1/+1
| | | | | | | | PHPBB3-11610
| * Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwordsMarc Alexander2013-12-291-258/+18
| |\ | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | [feature/passwords] Use passwords.manager service in login_forum_box()Marc Alexander2013-10-131-3/+5
| | | | | | | | | | | | | | | | | | | | | Additionally, unused variables have been removed from the globals and the request class is now used instead of the request_var() function. PHPBB3-11610
| * | [feature/passwords] Remove obsolete hashing functions from functions.phpMarc Alexander2013-10-111-110/+0
| | | | | | | | | | | | | | | | | | These hashing functions have been worked into the salted md5 driver. PHPBB3-11610
| * | [feature/passwords] Mark old hashing functions as deprecatedMarc Alexander2013-10-111-24/+6
| | | | | | | | | | | | PHPBB3-11610
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwordsMarc Alexander2013-10-031-13/+14
| |\ \ | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions.php
| * | | [feature/passwords] Use passwords manager in phpBB hash functionsMarc Alexander2013-10-021-37/+6
| | | | | | | | | | | | | | | | PHPBB3-11610
* | | | 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-071-2/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | [ticket/12034] AJAXify notifications popup.Cesar G2013-12-301-1/+2
| |_|_|_|/ |/| | | | | | | | | | | | | | PHPBB3-12034
* | | | | [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 pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-211-2/+0
|\ \ \ \ | |/ / / |/| | | [ticket/12005] Remove code responsible for PM popup completely
| * | | [ticket/12005] Remove PM popupLukasz2013-11-081-2/+0
| | | | | | | | | | | | | | | | PHPBB3-12005
* | | | Merge pull request #1790 from prototech/ticket/11280Nathan Guse2013-11-021-1/+0
|\ \ \ \ | |/ / / |/| | | [ticket/11280] Prevent duplicate entry in forums_track table.
| * | | [ticket/11280] Prevent duplicate entry in forums_track table.Cesar G2013-10-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforcing a time limit prevents all rows from being selected, thus a new row is inserted resulting in a duplicate entry. PHPBB3-11280
* | | | Merge remote-tracking branch 'nickvergessen/ticket/11974' into developDhruv2013-10-301-10/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11974: [ticket/11974] Fix timezone names with underscores [ticket/11974] Translate all timezones
| * | | | [ticket/11974] Translate all timezonesJoas Schilling2013-10-271-10/+4
| |/ / / | | | | | | | | | | | | PHPBB3-11974
* | | | Merge pull request #1784 from nickvergessen/ticket/11924Nils Adermann2013-10-281-6/+6
|\ \ \ \ | |/ / / |/| | | [Ticket/11924] Add a script to export the events in wiki format
| * | | [ticket/11924] Fix some minor issues with the php event docsJoas Schilling2013-10-161-6/+6
| | | | | | | | | | | | | | | | PHPBB3-11924
* | | | [ticket/11921] Directly inject unread messages count into the templateMatt Friedman2013-10-161-8/+2
| | | | | | | | | | | | | | | | PHPBB3-11921
* | | | [ticket/11921] Only get the count of unread PMsMatt Friedman2013-10-161-4/+1
| | | | | | | | | | | | | | | | PHPBB3-11921
* | | | [ticket/11921] Move any HTML for Notifications to the templatesMatt Friedman2013-10-161-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11921
* | | | [ticket/11921] Remove "l_" from non-lang variablesMatt Friedman2013-10-151-5/+5
| | | | | | | | | | | | | | | | PHPBB3-11921
* | | | [ticket/11921] Improve appearance of PM notifications in linklistMatt Friedman2013-10-151-8/+5
|/ / / | | | | | | | | | PHPBB3-11921
* | | Merge pull request #1764 from EXreaction/ticket/11874Nils Adermann2013-10-101-1/+1
|\ \ \ | | | | | | | | [ticket/11874] Do not always prepend the web path; only replace phpbb_root_path
| * | | [ticket/11874] Correct when $phpbb_root_path is appended to build_url()Nathan Guse2013-10-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11874
* | | | [ticket/11703] Also use empty() for T_JQUERY_LINK.Andreas Fischer2013-10-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11703
* | | | [ticket/11703] Make jQuery CDN switch more generic.Andreas Fischer2013-10-101-2/+2
|/ / / | | | | | | | | | | | | | | | | | | Config variable: load_jquery_cdn -> allow_cdn Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN PHPBB3-11703
* | | [ticket/11898] Correct admin S_LOGIN_ACTIONNathaniel Guse2013-10-091-2/+2
| |/ |/| | | | | PHPBB3-11898
* | Merge pull request #1735 from nickvergessen/ticket/11852Nathan Guse2013-09-301-13/+14
|\ \ | | | | | | Ticket/11852 filesystem class must not depend on a web request
| * | [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-261-13/+14
| |/ | | | | | | PHPBB3-11852
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-281-0/+7
|\ \ | |/ |/| | | | | | | | | * develop-olympus: [prep-release-3.0.12] Update changelog for 3.0.12 release. [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources.
| * [ticket/11873] Do not hash very large passwords in order to safe resources.Joas Schilling2013-09-281-0/+7
| | | | | | | | PHPBB3-11873
* | Merge pull request #1733 from nickvergessen/ticket/11866David King2013-09-251-1/+1
|\ \ | | | | | | Ticket/11866 Fix some more namespace issues
| * | [ticket/11866] Update some occurances of phpbb_db_ to new NamespaceJoas Schilling2013-09-261-1/+1
| | | | | | | | | | | | PHPBB3-11866