aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9746] Adding unit tests for inet_ntop() and inet_pton().Andreas Fischer2011-01-032-0/+44
| | | | PHPBB3-9746
* [ticket/9746] Adding calls to phpbb_ip_normalise() from session management.Andreas Fischer2011-01-031-0/+18
| | | | PHPBB3-9746
* [ticket/9746] Adding new function phpbb_ip_normalise().Andreas Fischer2011-01-031-0/+53
| | | | | | | | | | This adds a function that normalises internet protocol addresses. While there should be no problem at all when handling IPv4 addresses, the many different representations of the exact same IPv6 address and webservers mapping IPv4-addresses into the IPv6 space made it necessary to add such a function. PHPBB3-9746
* [ticket/9746] Adding tests for phpbb_ip_normalise().Andreas Fischer2011-01-032-0/+67
| | | | PHPBB3-9746
* Merge branch 'develop-olympus' into developAndreas Fischer2010-12-296-6/+6
|\ | | | | | | | | | | | | | | * develop-olympus: [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'. [ticket/9953] Set focus to password on re-authentication [ticket/9905] Add SQLite to the DSN description [ticket/9859] Remove years from the credit line.
| * Merge branch 'ticket/bantu/9859' into develop-olympusAndreas Fischer2010-12-292-2/+2
| |\ | | | | | | | | | | | | * ticket/bantu/9859: [ticket/9859] Remove years from the credit line.
| | * [ticket/9859] Remove years from the credit line.Andreas Fischer2010-12-162-2/+2
| | | | | | | | | | | | PHPBB3-9859
| * | Merge branch 'ticket/bantu/9348' into develop-olympusAndreas Fischer2010-12-291-1/+1
| |\ \ | | | | | | | | | | | | | | | | * ticket/bantu/9348: [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
| | * | [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.Richard Foote2010-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call phpbb_set_encoding() on 'default_dateformat' to properly re-encode non-ascii characters that might be in default_dateformat. E.g. "d M Y à H:i" PHPBB3-9348
| * | | Merge branch 'ticket/noxwizard/9953' into develop-olympusAndreas Fischer2010-12-292-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/noxwizard/9953: [ticket/9953] Set focus to password on re-authentication
| | * | | [ticket/9953] Set focus to password on re-authenticationPatrick Webster2010-12-282-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Sets the login focus to the password field when prompting for admin re-authentication, rather than the username field. PHPBB3-9953
| * | | Merge branch 'ticket/noxwizard/9905' into develop-olympusAndreas Fischer2010-12-291-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | * ticket/noxwizard/9905: [ticket/9905] Add SQLite to the DSN description
| | * | [ticket/9905] Add SQLite to the DSN descriptionPatrick Webster2010-12-281-1/+1
| |/ / | | | | | | | | | | | | | | | | | | The installer's DSN field has additional meanings for ODBC, PostgreSQL, and SQLite, but only the first two are mentioned. SQLite uses it for the file path. PHPBB3-9905
* | | Merge branch 'feature/igorw/update-session-api' into developAndreas Fischer2010-12-291-9/+20
|\ \ \ | | | | | | | | | | | | | | | | * feature/igorw/update-session-api: [feature/update-session-api] Add update_session method
| * | | [feature/update-session-api] Add update_session methodIgor Wiedler2010-12-291-9/+20
|/ / / | | | | | | | | | PHPBB3-9688
* | | Merge branch 'ticket/igorw/9574' into developAndreas Fischer2010-12-2810-241/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9574: [ticket/9574] Add pcre_utf8_support() function [ticket/9574] Remove conditional PHP<5.2 code [ticket/9574] Drop fallback implementations
| * | | [ticket/9574] Add pcre_utf8_support() functionIgor Wiedler2010-12-285-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the check for PCRE UTF-8 support into a new pcre_utf8_support() function. PHPBB3-9574
| * | | [ticket/9574] Remove conditional PHP<5.2 codeIgor Wiedler2010-12-2810-136/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a large amount of conditional code for PHP < 5.2 that can be removed with phpBB 3.1. PHPBB3-9574
| * | | [ticket/9574] Drop fallback implementationsIgor Wiedler2010-12-281-101/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phpBB 3.0 includes fallback implementations for following PHP5+ functions: array_combine str_split stripos htmlspecialchars_decode Since phpBB 3.1 requires PHP 5.2+ these can be dropped. PHPBB3-9574
* | | | Merge branch 'ticket/VSE/9532' into developAndreas Fischer2010-12-285-4/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * ticket/VSE/9532: [ticket/9532] Simplified page titles by removing meaningless text.
| * | | [ticket/9532] Simplified page titles by removing meaningless text.Matt2010-05-165-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed View Forum, View Topic, added pagination to forum and topic page titles, also moved the Site Name to the end of title for forum and topic view pages. PHPBB3-9532
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-12-212-1/+10
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9937] Make sure feed icon only shows for FORUM_POST [ticket/9937] The feed icon displays on External links...which we don't want [ticket/9925] prosilver logo margin bug in IE 6-7-8
| * | | Merge branch 'ticket/igorw/9937' into develop-olympusAndreas Fischer2010-12-211-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9937: [ticket/9937] Make sure feed icon only shows for FORUM_POST
| | * | | [ticket/9937] Make sure feed icon only shows for FORUM_POSTIgor Wiedler2010-12-211-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | This is cleaner, since feed.php only supports FORUM_POST. PHPBB3-9937
| * | | Merge branch 'ticket/rmcgirr83/9937' into develop-olympusIgor Wiedler2010-12-211-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/rmcgirr83/9937: [ticket/9937] The feed icon displays on External links...which we don't want
| | * | | [ticket/9937] The feed icon displays on External links...which we don't wantRMcGirr832010-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9937
| * | | | Merge branch 'ticket/marc1706/9925' into develop-olympusIgor Wiedler2010-12-211-0/+9
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * ticket/marc1706/9925: [ticket/9925] prosilver logo margin bug in IE 6-7-8
| | * | | [ticket/9925] prosilver logo margin bug in IE 6-7-8Marc Alexander2010-12-191-0/+9
| |/ / / | | | | | | | | | | | | PHPBB3-9925
* | | | Merge branch 'feature/igorw/request-class' into developAndreas Fischer2010-12-1610-29/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/igorw/request-class: [feature/request-class] Convert some remaining cookies [feature/request-class] Adjust misleading comment [feature/request-class] Remove direct access to _REQUEST in acp_search [feature/request-class] Special case of direct access to _REQUEST
| * | | | [feature/request-class] Convert some remaining cookiesIgor Wiedler2010-10-176-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert some remaining accesses to cookie to use the request class instead. Thanks to bantu for the note. PHPBB3-9716
| * | | | [feature/request-class] Adjust misleading commentIgor Wiedler2010-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9716
| * | | | [feature/request-class] Remove direct access to _REQUEST in acp_searchIgor Wiedler2010-10-172-11/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-9716
| * | | | [feature/request-class] Special case of direct access to _REQUESTIgor Wiedler2010-10-141-2/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-9716
* | | | | Merge branch 'develop-olympus' into developNils Adermann2010-12-132-1/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * develop-olympus: [ticket/9924] Pass template instance into $template->display hook
| * | | | Merge branch 'ticket/igorw/9924' into develop-olympusNils Adermann2010-12-132-1/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9924: [ticket/9924] Pass template instance into $template->display hook
| | * | | | [ticket/9924] Pass template instance into $template->display hookIgor Wiedler2010-11-232-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9924
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2010-12-1317-33/+313
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9851] "Search new posts" should require login. [task/phpdoc] Added a phpdoc task to the build process [task/phpdoc] Added a configuration file for phpDocumentor. [feature/acm-wincache] Adding caching module for WinCache's User Cache. [ticket/9939] Fix JavaScript error in admin recaptcha template [ticket/9575] Also change 'administrate' to 'administer' in templates [ticket/8736] guest can have 255 chars long username [ticket/9928] Do not link "login to your board" to the "send statistics" page. [ticket/9575] Change 'administrate' to 'administer' [ticket/9921] Adding sample configuration file for the lighttpd webserver. [ticket/9932] Add the Bing bot when converting [ticket/9930] Redirect failes with open_basedir enabled. [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
| * | | | | Merge branch 'ticket/adamreyher/9928' into develop-olympusNils Adermann2010-12-131-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/adamreyher/9928: [ticket/9928] Do not link "login to your board" to the "send statistics" page.
| | * | | | | [ticket/9928] Do not link "login to your board" to the "send statistics" page.Adam Reyher2010-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9928
| * | | | | | Merge branch 'task/naderman/phpdoc' into develop-olympusAndreas Fischer2010-12-132-1/+113
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * task/naderman/phpdoc: [task/phpdoc] Added a phpdoc task to the build process [task/phpdoc] Added a configuration file for phpDocumentor.
| | * | | | | | [task/phpdoc] Added a phpdoc task to the build processNils Adermann2010-12-131-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9943
| | * | | | | | [task/phpdoc] Added a configuration file for phpDocumentor.Nils Adermann2010-12-131-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9943
| * | | | | | | Merge branch 'feature/ChrisTX/acm-wincache' into develop-olympusAndreas Fischer2010-12-131-0/+84
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/ChrisTX/acm-wincache: [feature/acm-wincache] Adding caching module for WinCache's User Cache.
| | * | | | | | | [feature/acm-wincache] Adding caching module for WinCache's User Cache.ChrisTX2010-12-131-0/+84
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9942
| * | | | | | | Merge branch 'ticket/rxu/9851' into develop-olympusAndreas Fischer2010-12-132-22/+35
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/9851: [ticket/9851] "Search new posts" should require login.
| | * | | | | | [ticket/9851] "Search new posts" should require login.rxu2010-12-132-22/+35
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The newposts search uses user_lastvisit, so it should require user to log in. PHPBB3-9851
| * | | | | | Merge branch 'ticket/igorw/9939' into develop-olympusChris Smith2010-12-051-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9939: [ticket/9939] Fix JavaScript error in admin recaptcha template
| | * | | | | | [ticket/9939] Fix JavaScript error in admin recaptcha templateIgor Wiedler2010-12-051-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-9939
| * | | | | | Merge branch 'ticket/adamreyher/9575' into develop-olympusIgor Wiedler2010-12-055-5/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/adamreyher/9575: [ticket/9575] Also change 'administrate' to 'administer' in templates [ticket/9575] Change 'administrate' to 'administer'
| | * | | | | | [ticket/9575] Also change 'administrate' to 'administer' in templatesIgor Wiedler2010-12-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9575