aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Bump version to 3.0.7-RC2.Andreas Fischer2010-02-181-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10506 89ea8834-ac86-4346-8a33-228a782c2dd0
* Merge r10497 and r10499 into 3.0.7 - #57755Andreas Fischer2010-02-182-3/+5
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10502 89ea8834-ac86-4346-8a33-228a782c2dd0
* Merge r10496 - Bug #57795 - [Fix] Restrict search for language/../iso.txt to ↵Joas Schilling2010-02-171-0/+5
| | | | | | | | folders. Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10498 89ea8834-ac86-4346-8a33-228a782c2dd0
* Merge r10484 and r10485 into 3.0.7 branch.Andreas Fischer2010-02-083-5/+6
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10486 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix #57395, a regression from r10427Josh Woody2010-02-071-1/+1
| | | | | | (merging r10482 into branch_3_0_7) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10483 89ea8834-ac86-4346-8a33-228a782c2dd0
* Merge r10473 into the 3.0.7 branch.Josh Woody2010-02-041-2/+16
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10476 89ea8834-ac86-4346-8a33-228a782c2dd0
* Change version numbers to 3.0.7 and 3.0.7-RC1 for a QA releaseNils Adermann2010-02-011-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10467 89ea8834-ac86-4346-8a33-228a782c2dd0
* Do not store email templates in database. [Bug #54505]Nils Adermann2010-01-262-16/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To explain what this is about, first a short phpBB code history lesson: ;-) r9823 originally introduced the usage of our template class for emails. The messenger class uses set_custom_template() to initialise the template object which neither disables storedb nor inheritance. These two values are set in $user->theme rather than inside a particular template instance (quite a design failure if I may add). Thus the html page that is displayed to the user also determines these settings for the email templates. This obviously causes problems because both emails and other custom templates can quite simply not be stored in the database because the db table only stores the filename, not the path and requires a template id. r9839 then generally disabled storedb and template inheritance for custom templates to fix Bug #40515. This works for custom templates, but not for emails where lots of template objects are created. In such a situation the last call to set(_custom)_template() would now determine the values of storedb and inheritance in _tpl_load. So any page sending emails would neither load its template from the database nor use template inheritance. The same revision also introduced orig_tpl_* variables in set_template() which on their own are very much pointless, but could allow resetting the storedb and inheritance values if they were used to reset $user->theme just before template execution in _tpl_load. In r10150 these orig_tpl_* variables are correctly used to access information about the template of the page being displayed - contrary to the last template used - from within the bbcode, fixing Bug #51285. However r10150 also introduces a pointless $template_mode parameter for set_custom_template(). $template_mode is really just a boolean flag (value you can be 'template' or an arbitrary other value) that if it set circumvents the unsetting of storedb and template inheritance. The very code that had been added to prevent issues with emails and custom templates. Fixing the problem introduced by r8839 but at the same time reintroducing the much greater problem from the original implementation of email templates. And now an explanation of what I did: Based on this I have now changed the set_custom_template method to always disable storedb. It can now properly use inheritance, you simply tell it the path where the parent template can be found, by default the path is false which will turn inheritance off. To make this work the template class now always overwrites $user->theme storedb and inheritance variabbles with orig_tpl_* just before rendering a template in _tpl_load. This way they are guaranteed to always contain the value they had at the time set_template/set_custom_template were called. This fixes [Bug #54505]. In summary, using global state is simply a horrible idea in object oriented programming. Always Pass values, that an object depends on, as parameters - never through magic global variables. Following this principle will safe you from a lot of headaches. Please test this patch as much as possible to make sure templates still work properly for you, focus on multiple languages, missing language files, and custom templates in systems that make use of the template class outside of phpBB itself. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10460 89ea8834-ac86-4346-8a33-228a782c2dd0
* okay, now the confirm_id is no longer enough to get a new row into the qa tableHenry Sudhof2010-01-261-15/+3
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10459 89ea8834-ac86-4346-8a33-228a782c2dd0
* Add a warning for users of old PHP versions about ending support.Josh Woody2010-01-261-0/+8
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10458 89ea8834-ac86-4346-8a33-228a782c2dd0
* erm, that wouldn't workHenry Sudhof2010-01-261-3/+3
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10457 89ea8834-ac86-4346-8a33-228a782c2dd0
* tuningHenry Sudhof2010-01-261-0/+38
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10454 89ea8834-ac86-4346-8a33-228a782c2dd0
* debug code, begoneHenry Sudhof2010-01-261-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10453 89ea8834-ac86-4346-8a33-228a782c2dd0
* tuningHenry Sudhof2010-01-261-5/+5
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10451 89ea8834-ac86-4346-8a33-228a782c2dd0
* ACP usabilityHenry Sudhof2010-01-261-12/+61
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10450 89ea8834-ac86-4346-8a33-228a782c2dd0
* Further fixes for r10447 and r10448. Correctly account for custom language ↵Josh Woody2010-01-261-1/+10
| | | | | | directories (caught by naderman) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10449 89ea8834-ac86-4346-8a33-228a782c2dd0
* Remove needless check (revising r10447)Josh Woody2010-01-261-7/+4
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10448 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fall back to board default language email template if the file does not ↵Josh Woody2010-01-261-2/+8
| | | | | | exist user's preferred language (#35595) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10447 89ea8834-ac86-4346-8a33-228a782c2dd0
* Database updater now separates ADD COLUMN from SET NOT NULL and SET DEFAULT, ↵Nils Adermann2010-01-261-1/+23
| | | | | | when using PostgreSQL <= 7.4 [Bug #54435] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10446 89ea8834-ac86-4346-8a33-228a782c2dd0
* [Fix] Don't send activation email when user tries to change email without ↵Cullen Walsh2010-01-251-5/+8
| | | | | | | | | permission (fix by nrohler). (Bug #56335) Authorised by: naderman git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10443 89ea8834-ac86-4346-8a33-228a782c2dd0
* Deprecate $allow_reply parameter to truncate_string() (Bug #56675)Josh Woody2010-01-251-2/+3
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10442 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #52495 - [Fix] Replace hard coded "px" with translated language-string.Joas Schilling2010-01-251-3/+3
| | | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10441 89ea8834-ac86-4346-8a33-228a782c2dd0
* [Fix] Don't send activation email when user tries to change email without ↵Cullen Walsh2010-01-251-1/+1
| | | | | | | | | permission (fix by nrohler). (Bug #56335) Authorised by: naderman git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10438 89ea8834-ac86-4346-8a33-228a782c2dd0
* [Fix] Do not automatically unsubscribe users from topics, when email and ↵Joas Schilling2010-01-241-1/+1
| | | | | | | | jabber is disabled. Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10436 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #55045 - Do not duplicate previous/next links in pagination text of ↵Ruslan Uzdenov2010-01-242-2/+2
| | | | | | | | moderator logs and user notes in MCP for subsilver2. Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10433 89ea8834-ac86-4346-8a33-228a782c2dd0
* Trigger error right away if user has exceeded login attempts instead of ↵Andreas Fischer2010-01-201-0/+5
| | | | | | asking for the authentication data over and over again without accepting it even if it is correct. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10432 89ea8834-ac86-4346-8a33-228a782c2dd0
* Make sure captcha factory is there. Make sure language array is there.Andreas Fischer2010-01-202-0/+10
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10431 89ea8834-ac86-4346-8a33-228a782c2dd0
* [Feature] Ability to use HTTP authentication in ATOM feeds by passing the ↵Andreas Fischer2010-01-193-0/+99
| | | | | | GET parameter auth=http git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10430 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #56285 - Properly calculate posts in a topic in the MCPCullen Walsh2010-01-191-1/+8
| | | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10428 89ea8834-ac86-4346-8a33-228a782c2dd0
* - Bug #56255 - Moving topics to a forum where you are on queue Josh Woody2010-01-183-8/+19
| | | | | | - Allow some error handling in compress class by returning false if file does not exist. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10427 89ea8834-ac86-4346-8a33-228a782c2dd0
* Friends and foes will not show up as private message rule options if their ↵Chris Smith2010-01-181-0/+17
| | | | | | respective UCP modules are disabled. #51155 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10425 89ea8834-ac86-4346-8a33-228a782c2dd0
* Include live data in the statistics #53795Chris Smith2010-01-171-0/+4
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10423 89ea8834-ac86-4346-8a33-228a782c2dd0
* The easy solution to all my problems with SQLite is this. :( #56105Chris Smith2010-01-171-1/+8
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10422 89ea8834-ac86-4346-8a33-228a782c2dd0
* Load reCAPTCHA over https when using a secure connection to the board. #55755Chris Smith2010-01-171-0/+7
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10420 89ea8834-ac86-4346-8a33-228a782c2dd0
* spacesHenry Sudhof2010-01-171-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10418 89ea8834-ac86-4346-8a33-228a782c2dd0
* Invalidate captcha after regHenry Sudhof2010-01-171-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10417 89ea8834-ac86-4346-8a33-228a782c2dd0
* Invalidate captcha after regHenry Sudhof2010-01-171-0/+6
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10415 89ea8834-ac86-4346-8a33-228a782c2dd0
* spacesHenry Sudhof2010-01-171-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10413 89ea8834-ac86-4346-8a33-228a782c2dd0
* spacesHenry Sudhof2010-01-171-4/+4
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10412 89ea8834-ac86-4346-8a33-228a782c2dd0
* Always require a fresh solved captcha, don't accept a stored solution.Henry Sudhof2010-01-171-3/+8
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10411 89ea8834-ac86-4346-8a33-228a782c2dd0
* Mirror login captcha option on captcha settingsHenry Sudhof2010-01-171-0/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10410 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix r10391 - Bug #56025 - Pagination of User Notes in MCP uses two different ↵Joas Schilling2010-01-171-1/+1
| | | | | | | | | | config values. Authorised by: ToonArmy git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10407 89ea8834-ac86-4346-8a33-228a782c2dd0
* make userdata availableHenry Sudhof2010-01-141-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10406 89ea8834-ac86-4346-8a33-228a782c2dd0
* No longer include subforums in forum feed.Andreas Fischer2010-01-122-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10405 89ea8834-ac86-4346-8a33-228a782c2dd0
* Safe us some more calls to $db->sql_escape().Andreas Fischer2010-01-112-4/+4
| | | | | | | Authorised by: naderman :-P git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10399 89ea8834-ac86-4346-8a33-228a782c2dd0
* Oops thanks rxu, fixes r10309 refs #54465Chris Smith2010-01-071-0/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10396 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #56025 - Pagination of User Notes in MCP uses two different config values.Joas Schilling2009-12-301-1/+1
| | | | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10391 89ea8834-ac86-4346-8a33-228a782c2dd0
* Reflect feed configuration parameter changes in questionnaire.Andreas Fischer2009-12-291-4/+5
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10389 89ea8834-ac86-4346-8a33-228a782c2dd0
* Integrate active topics feed. Some language adjustments and rearrangements.Andreas Fischer2009-12-272-2/+4
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10382 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #55865 - Correctly move sql_row_pointer forward when calling ↵Andreas Fischer2009-12-252-2/+2
| | | | | | sql_fetchfield() on cached queries. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10379 89ea8834-ac86-4346-8a33-228a782c2dd0
generated by cgit v1.2.1 (git 2.21.0) at 2025-09-09 06:49:09 +0000