mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00
Code Issues Releases Wiki Activity
9,154 Commits 17 Branches 190 Tags
Commit Graph

4024 Commits

Author SHA1 Message Date
Joas Schilling
0ddc370386 Merge r10496 - Bug #57795 - [Fix] Restrict search for language/../iso.txt to folders. 
Authorised by: bantu

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10498 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-17 18:40:22 +00:00
Andreas Fischer
8682f644e5 Merge r10484 and r10485 into 3.0.7 branch. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10486 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-08 16:54:39 +00:00
Josh Woody
f631d62508 Fix #57395, a regression from r10427 
(merging r10482 into branch_3_0_7)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10483 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-07 01:06:37 +00:00
Josh Woody
4a17abbcc4 Merge r10473 into the 3.0.7 branch. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10476 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-04 01:07:30 +00:00
Nils Adermann
20301d6b9f Change version numbers to 3.0.7 and 3.0.7-RC1 for a QA release 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10467 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-01 00:49:35 +00:00
Nils Adermann
6e31ce8573 Do not store email templates in database. [Bug #54505] 
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
 2010-01-26 16:52:46 +00:00
Henry Sudhof
81e62b4da8 okay, now the confirm_id is no longer enough to get a new row into the qa table 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10459 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-26 15:34:21 +00:00
Josh Woody
8fa06090c4 Add a warning for users of old PHP versions about ending support. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10458 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-26 15:26:07 +00:00
Henry Sudhof
62d7e3c634 erm, that wouldn't work 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10457 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-26 14:58:55 +00:00
Henry Sudhof
8a9c7c92be tuning 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10454 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-26 14:01:20 +00:00
Henry Sudhof
3e224cf856 debug code, begone 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10453 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-26 11:41:43 +00:00
Henry Sudhof
345de34ac1 tuning 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10451 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-26 11:07:47 +00:00
Henry Sudhof
b4c87cc504 ACP usability 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10450 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-26 10:57:00 +00:00
Josh Woody
b4d6b1e980 Further fixes for r10447 and r10448. Correctly account for custom language directories (caught by naderman) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10449 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-26 04:11:58 +00:00
Josh Woody
a314b2807f Remove needless check (revising r10447) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10448 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-26 03:43:02 +00:00
Josh Woody
ff1aa876b5 Fall back to board default language email template if the file does not exist user's preferred language (#35595) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10447 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-26 03:30:43 +00:00
Nils Adermann
870921c872 Database updater now separates ADD COLUMN from SET NOT NULL and SET DEFAULT, when using PostgreSQL <= 7.4 [Bug #54435] 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10446 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-26 02:06:37 +00:00
Cullen Walsh
fe98d43bb5 [Fix] Don't send activation email when user tries to change email without 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
 2010-01-25 18:19:18 +00:00
Josh Woody
4eda4855ef Deprecate $allow_reply parameter to truncate_string() (Bug #56675) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10442 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-25 18:02:37 +00:00
Joas Schilling
7a1b507fa6 Bug #52495 - [Fix] Replace hard coded "px" with translated language-string. 
Authorised by: bantu


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10441 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-25 15:57:10 +00:00
Cullen Walsh
fb96fcd90a [Fix] Don't send activation email when user tries to change email without 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
 2010-01-25 09:11:16 +00:00
Joas Schilling
7d6718630b [Fix] Do not automatically unsubscribe users from topics, when email and jabber is disabled. 
Authorised by: bantu

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10436 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-24 22:30:43 +00:00
Ruslan Uzdenov
b44288e0cf Fix bug #55045 - Do not duplicate previous/next links in pagination text of 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
 2010-01-24 16:00:18 +00:00
Andreas Fischer
04ce664604 Trigger error right away if user has exceeded login attempts instead of 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
 2010-01-20 01:05:36 +00:00
Andreas Fischer
f98ca7ce48 Make sure captcha factory is there. Make sure language array is there. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10431 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-20 00:20:46 +00:00
Andreas Fischer
77af6caed7 [Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10430 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-19 19:08:51 +00:00
Cullen Walsh
f40418296a Bug #56285 - Properly calculate posts in a topic in the MCP 
Authorised by: bantu


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10428 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-19 00:14:31 +00:00
Josh Woody
ad14664a3a - Bug #56255 - Moving topics to a forum where you are on queue 
- 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
 2010-01-18 16:41:21 +00:00
Chris Smith
6924580e7d Friends and foes will not show up as private message rule options if their respective UCP modules are disabled. #51155 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10425 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-18 00:11:20 +00:00
Chris Smith
e2deb29d59 Include live data in the statistics #53795 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10423 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-17 18:02:04 +00:00
Chris Smith
bdf60ab2c1 The easy solution to all my problems with SQLite is this. :( #56105 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10422 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-17 17:41:21 +00:00
Chris Smith
af6c5dd41d Load reCAPTCHA over https when using a secure connection to the board. #55755 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10420 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-17 17:25:14 +00:00
Henry Sudhof
0480a4e91e spaces 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10418 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-17 17:16:08 +00:00
Henry Sudhof
f9692abe92 Invalidate captcha after reg 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10417 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-17 17:04:56 +00:00
Henry Sudhof
1d0197a3dd Invalidate captcha after reg 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10415 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-17 16:55:17 +00:00
Henry Sudhof
f7f3471e3f spaces 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10413 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-17 16:48:58 +00:00
Henry Sudhof
b4d8a0e538 spaces 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10412 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-17 16:48:46 +00:00
Henry Sudhof
ef2cd7b6c9 Always require a fresh solved captcha, don't accept a stored solution. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10411 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-17 16:46:41 +00:00
Henry Sudhof
9532ba3c3d Mirror login captcha option on captcha settings 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10410 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-17 16:37:58 +00:00
Joas Schilling
9dde6d8583 Fix r10391 - Bug #56025 - Pagination of User Notes in MCP uses two different config values. 
Authorised by: ToonArmy



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10407 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-17 16:27:59 +00:00
Henry Sudhof
0139246ccb make userdata available 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10406 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-14 22:55:38 +00:00
Andreas Fischer
0f5856ce5b No longer include subforums in forum feed. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10405 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-12 21:15:32 +00:00
Andreas Fischer
f4aa5b7ac7 Safe us some more calls to $db->sql_escape(). 
Authorised by: naderman :-P


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10399 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-11 23:26:56 +00:00
Chris Smith
4a80b883ab Oops thanks rxu, fixes r10309 refs #54465 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10396 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-07 09:09:39 +00:00
Joas Schilling
267692ad5c Bug #56025 - Pagination of User Notes in MCP uses two different config values. 
Authorised by: bantu



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10391 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-30 13:12:02 +00:00
Andreas Fischer
ac94d2dea3 Reflect feed configuration parameter changes in questionnaire. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10389 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-29 14:33:22 +00:00
Andreas Fischer
ad7e3ccf4c Integrate active topics feed. Some language adjustments and rearrangements. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10382 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-27 00:48:52 +00:00
Andreas Fischer
faf95e858f Bug #55865 - Correctly move sql_row_pointer forward when calling sql_fetchfield() on cached queries. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10379 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-25 15:55:35 +00:00
Marek A. R
f601599e63 Fix for #54945 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10378 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-24 00:47:00 +00:00
Nils Adermann
dd02aed6e1 Improved search query performance through sorting words by their occurance. [Bug #21555] 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10377 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-23 19:38:09 +00:00