aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/session.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'unknownbliss/ticket/9916' into developAndreas Fischer2012-01-021-2/+1
|\ | | | | | | | | * unknownbliss/ticket/9916: [ticket/9916] Updating header license and removing Version $Id$
| * [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-311-2/+1
| | | | | | | | PHPBB3-9916
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-251-27/+30
|\ \ | |/ |/| | | | | | | | | | | * develop-olympus: [ticket/10428] Documentation for optionget/optionset functions. [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness. [ticket/10428] Dispose of $this->keyvalues cache for optionget. [ticket/10428] Compare $data to false strictly.
| * [ticket/10428] Documentation for optionget/optionset functions.Oleg Pudeyev2011-12-251-2/+15
| | | | | | | | PHPBB3-10428
| * [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.Oleg Pudeyev2011-12-251-16/+12
| | | | | | | | PHPBB3-10428
| * [ticket/10428] Dispose of $this->keyvalues cache for optionget.Oleg Pudeyev2011-12-251-8/+2
| | | | | | | | | | | | | | | | | | | | It does not work properly when custom $data is provided, and making it work will make the code so complicated that any benefits from having this cache in the first place will be nullified. Just get rid of it. PHPBB3-10428
| * [ticket/10428] Compare $data to false strictly.Oleg Pudeyev2011-12-251-4/+4
| | | | | | | | | | | | | | Users may pass 0 or '' for $data, this should cause the user-specified $data code path to be taken. PHPBB3-10428
* | [ticket/10345] Check directly whether the key to use existsJoas Schilling2011-11-301-8/+16
| | | | | | | | PHPBB3-10345
* | [ticket/10345] Return the language key when the key has an empty arrayJoas Schilling2011-11-301-0/+5
| | | | | | | | PHPBB3-10345
* | [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_formJoas Schilling2011-11-301-1/+1
| | | | | | | | | | | | The numbers are floored by casting to int. PHPBB3-10345
* | [ticket/10345] Remove doubled check for valid plural ruleJoas Schilling2011-11-301-4/+0
| | | | | | | | PHPBB3-10345
* | [ticket/10345] Move rule determination code into a new functionJoas Schilling2011-11-251-153/+1
| | | | | | | | PHPBB3-10345
* | [ticket/10345] Make the use of the 0-case optionalJoas Schilling2011-11-251-34/+40
| | | | | | | | | | | | And correctly determinate the rule otherwise PHPBB3-10345
* | [ticket/10345] Fix some documentation issues.Joas Schilling2011-11-251-5/+5
| | | | | | | | PHPBB3-10345
* | [ticket/10345] Allow float as array key and add some testsJoas Schilling2011-11-251-2/+4
| | | | | | | | | | | | Added tests for the fallback when a key is missing and the float-feature. PHPBB3-10345
* | [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-251-0/+3
| | | | | | | | PHPBB3-10345
* | [ticket/10345] Remove '1 hour ago' string which conflicted with plural rulesJoas Schilling2011-11-251-2/+2
| | | | | | | | | | | | | | | | This message was only viewed for 1 second anyway, as floor($delta / 60) is only 60 for 3600 to 3660, but the code was limited to $delta <= 3600 PHPBB3-10345
* | [ticket/10345] Fix documentation on the new function and the switchJoas Schilling2011-11-251-2/+13
| | | | | | | | | | | | Also do not min/max the value, but throw an error on an invalid Plural rule. PHPBB3-10345
* | [ticket/10345] Add a system to allow multiple plural formsJoas Schilling2011-11-251-1/+169
| | | | | | | | | | | | See http://wiki.phpbb.com/Plural_Rules for explanation and examples. PHPBB3-10345
* | [feature/extension-manager] Use "core files" instead of "global files" in docsNils Adermann2011-11-181-2/+2
| | | | | | | | PHPBB3-10323
* | [feature/extension-manager] Support for loading language files from extensionsNils Adermann2011-10-141-14/+54
| | | | | | | | | | | | | | The referenced extension needs to be explicitly specified in an add_lang_ext() call. PHPBB3-10323
* | [feature/remove-db-styles] Remove DB theme handling code from session.Chris Smith2011-09-201-49/+2
| | | | | | | | PHPBB3-9741
* | [feature/remove-db-styles] Removed database storage of style components.Chris Smith2011-09-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The bulk of database storage of templates is removed, rendering template stored in the database as useless. Theme database storage is reduced to a skeleton for full removal soon. This commit was cherry picked from the old feature/ascraeus-experiment branch the old commit hash is 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e. PHPBB3-9741
* | [feature/remove-imagesets] Adjustments to php filesVjacheslav Trushkin2011-09-041-177/+9
| | | | | | | | | | | | Removing imagesets. Adjustments to php files PHPBB3-10336
* | Merge branch 'develop-olympus' into developNils Adermann2011-08-251-0/+33
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/10320] Exclude passworded forums when determining "Most active topic". [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
| * [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.Andreas Fischer2011-08-251-0/+33
| | | | | | | | PHPBB3-10320
* | [feature/request-class] Adjust code base to do html decoding manuallyIgor Wiedler2011-08-181-8/+8
| | | | | | | | PHPBB3-9716
* | [feature/request-class] Remove useless conditionIgor Wiedler2011-07-161-1/+1
| | | | | | | | PHPBB3-9716
* | [feature/request-class] Add server(), header() and is_ajax() to requestIgor Wiedler2011-07-151-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | Extend the request class with helpers for reading server vars (server()) and HTTP request headers (header()). Refactor the existing code base to make use of these helpers, make $_SERVER a deactivated super global. Also introduce an is_ajax() method, which checks the X-Requested-With header for the value 'XMLHttpRequest', which is sent by JavaScript libraries, such as jQuery. PHPBB3-9716
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-071-1/+36
|\ \ | |/ | | | | | | | | | | | | * develop-olympus: [ticket/10250] The site_logo hash is different depending on imageset & language [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol
| * [ticket/10250] The site_logo hash is different depending on imageset & languageNils Adermann2011-07-061-4/+12
| | | | | | | | PHPBB3-10250
| * [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is usedNils Adermann2011-07-051-1/+28
| | | | | | | | | | | | | | | | | | | | The new logo is slightly wider than the old logo. If we changed the size in the imageset.cfg we would cause a conflict for everyone who replaced the logo with their own and modified the size. Instead we overwrite the width and height in the img() function in session.php only if its contents are that of the stock phpbb logo. PHPBB3-10250
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-111-0/+4
|\ \ | |/ | | | | | | | | | | | | | | * develop-olympus: [ticket/9992] Clarify explanations of ip and account limits on login [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN [ticket/9992] Use sql_fetchfield for single row and single column result [ticket/9992] Adding a limit on login attempts per IP. [ticket/9992] Make sql_create_table and sql_table_exists available in updater
| * Merge remote-tracking branch 'naderman/ticket/9992' into develop-olympusAndreas Fischer2011-06-111-0/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/9992: [ticket/9992] Clarify explanations of ip and account limits on login [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN [ticket/9992] Use sql_fetchfield for single row and single column result [ticket/9992] Adding a limit on login attempts per IP. [ticket/9992] Make sql_create_table and sql_table_exists available in updater
| | * [ticket/9992] Adding a limit on login attempts per IP.Nils Adermann2011-06-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new table was created to save all failed login attempts with corresponding information on username, ip and useragent. By default the limit is 50 login attempts within 6 hours per IP. The limit is relatively high to avoid big problems on sites behind a reverse proxy that don't receive the forwarded-for value as REMOTE_ADDR but see all users as coming from the same IP address. But if these users run into problems a special forwarded-for option is available to limit logins by forwarded-for value instead of ip. PHPBB3-9992
* | | Merge branch 'develop-olympus' into developNils Adermann2011-06-111-0/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/9908] Send 301 before stripping SID so bots do (hopefully) not revisit.
| * | [ticket/9908] Send 301 before stripping SID so bots do (hopefully) not revisit.Andreas Fischer2011-06-101-0/+1
| |/ | | | | | | PHPBB3-9908
* | Merge branch 'develop-olympus' into developNils Adermann2011-06-101-18/+23
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9802] Remove unnecessary htmlspecialchars() call on REMOTE_ADDR. [ticket/9802] Only check for IPv4-mapped address when address is IPv6. [ticket/9802] Fix tiny logic bug in loop determining REMOTE_ADDR. [ticket/9802] Remove redundant character class definition from preg_replace. [ticket/9802] Fix redundant str_replace call. No need to replace ' ' with ' '. Conflicts: phpBB/includes/session.php
| * Merge branch 'ticket/bantu/9802' into develop-olympusNils Adermann2011-06-101-18/+23
| |\ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9802: [ticket/9802] Remove unnecessary htmlspecialchars() call on REMOTE_ADDR. [ticket/9802] Only check for IPv4-mapped address when address is IPv6. [ticket/9802] Fix tiny logic bug in loop determining REMOTE_ADDR. [ticket/9802] Remove redundant character class definition from preg_replace. [ticket/9802] Fix redundant str_replace call. No need to replace ' ' with ' '.
| | * [ticket/9802] Remove unnecessary htmlspecialchars() call on REMOTE_ADDR.Andreas Fischer2011-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The value in $_SERVER['REMOTE_ADDR'] is either validated to be a valid IP address or is replaced by our default value. Valid IP addresses do not contain HTML special characters, thus the htmlspecialchars() call is unnecessary. PHPBB3-9802
| | * [ticket/9802] Only check for IPv4-mapped address when address is IPv6.Andreas Fischer2011-04-191-14/+19
| | | | | | | | | | | | PHPBB3-9802
| | * [ticket/9802] Fix tiny logic bug in loop determining REMOTE_ADDR.Andreas Fischer2011-04-191-2/+2
| | | | | | | | | | | | | | | | | | When $ip is empty() it was assigned to $this->ip. PHPBB3-9802
| | * [ticket/9802] Remove redundant character class definition from preg_replace.Andreas Fischer2011-04-191-2/+2
| | | | | | | | | | | | PHPBB3-9802
| | * [ticket/9802] Fix redundant str_replace call. No need to replace ' ' with ' '.Andreas Fischer2011-04-191-2/+2
| | | | | | | | | | | | PHPBB3-9802
* | | Merge branch 'develop-olympus' into developNils Adermann2011-06-051-0/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10158] Remove some code duplication from generating the message. [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed. [ticket/10158] Only view "Return to" links if they are useful. [ticket/10158] Add return-link to folder, when the user replied from a folder. [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
| * | [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.Andreas Fischer2011-05-261-0/+6
| |/ | | | | | | | | | | There is no support for IPv6 addresses in the blacklists we check right now. PHPBB3-10195
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-261-6/+7
|\ \ | |/ | | | | | | * develop-olympus: [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.
| * [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.Andreas Fischer2011-02-251-6/+7
| | | | | | | | | | | | | | | | This also moves the code up to the point where we know that the user is a bot. Regression from d07e152ea7e820c5a0e47aeb8004fa0b5621a314 PHPBB3-9912
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-02-071-0/+1
|\ \ | |/ | | | | | | | | * develop-olympus: [ticket/9949] Unit tests for user::lang() [ticket/9949] $user->lang() uses last int-value to get the key not first
| * [ticket/9949] $user->lang() uses last int-value to get the key not firstJoas Schilling2011-01-291-0/+1
| | | | | | | | | | | | | | | | The comment in the code says: "We now get the first number passed and will select the key based upon this number". But the loop over the arguments is not left and therefore it uses the last int-value not the first one. PHPBB3-9949