1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

970 Commits

Author SHA1 Message Date
Nils Adermann
c0cd713f4c Updated AUTHORS file, hope I didn't get any names wrong ;-)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10461 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-28 21:19:43 +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
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
Ruslan Uzdenov
5df687f820 Fix bugs #55485 and #55545 - styles adjustment to correctly display an order of rtl/ltr mixed content.
Authorised by: bantu

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10456 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 14:11:00 +00:00
Joas Schilling
283ad368eb Bug #54745 - Fix language string for PM-Reports refering to post-data.
Authorised by: jelly_doughnut

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10455 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 14:06:00 +00:00
Henry Sudhof
ac27e1961a doc
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10452 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 11:11:15 +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
bdd81806f2 Ignore that last commit message in r10443.
Update user's last visit field correctly when changing activation status (Bug #56185)

Regression introduced by r10103 for Bug #44975

Authorised by: bantu



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10444 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-25 18:24:57 +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
Joas Schilling
c5e01c9508 Bug #49945 - [Fix] Correctly hover list menu in UCP and MCP for rtl languages.
Authorised by: bantu

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10440 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-25 15:43:05 +00:00
Joas Schilling
60e68b1b58 Bug #33745 - [Fix] Correctly orientate quoted text image on RTL languages.
Authorised by: bantu

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10439 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-25 15:36:39 +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
92e7b1e3df Fix: "typo" on r10436
Authorised by: bantu

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10437 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-24 22:35:58 +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
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
Ruslan Uzdenov
ff0b94f238 Fix bug #56075 - "Bump Topic" link not showing when bump interval is 0
Authorised by: Jelly_Doughnut

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10429 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-19 13:33:07 +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
Ruslan Uzdenov
cb389894e9 Fix bug #51585 - Search loginbox or auth message differs
Authorised by: ToonArmy

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10426 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-18 15:50:13 +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
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
2fd7cd661b update log
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10419 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-17 17:23:47 +00:00
Ruslan Uzdenov
f7575b3a0c Fix bug #56555 - Quick reply + posting permission
Authorised by: ToonArmy

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10414 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-17 16:49:23 +00:00
Chris Smith
1f59edf140 Don't submit when pressing enter on preview button. Regression from r10069 #54395
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10409 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-17 16:32:10 +00:00
Joas Schilling
f8178778f8 Bug #56235 - Do not unsubscribe users from topics replying with quickreply.
Authorised by: ToonArmy



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10408 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-17 16:30:33 +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
9dc5c9271a Fix Bug #56125 - XHTML mistakes in Coding Guidelines. Patch by leviatan21.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10395 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-01 23:39:31 +00:00
Andreas Fischer
a16c624d26 Small text corrections. r10393
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10394 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-31 17:32:49 +00:00
Andreas Fischer
771774f09a Remove complex query, add true sorting for viewprofile group list. Related to #31845
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10393 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-31 17:07:34 +00:00
Andreas Fischer
a096b3d981 Fix Bug #31845 - List hidden groups on viewprofile where the viewing user is also a member.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10392 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-31 16:31:57 +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
d67d6ed26a Fix Bug #30315 - No longer use group colours for usernames on print view. Colour could be white. Patch by Pasqualle.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10387 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-29 02:11:16 +00:00
Andreas Fischer
33fde908ee Fix Bug #55895 - Missing CSS background parameter, thanks Planet Styles.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10386 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-28 17:10:44 +00:00
Andreas Fischer
ab4f3157ac Small changelog corrections.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10383 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-27 02:34:57 +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
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
Andreas Fischer
38d0f0f2d9 Fix language in r10375. #55785
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10376 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-23 15:10:45 +00:00
Andreas Fischer
409dfe5256 Fix Bug #55785 - Correct call to mysql_pconnect().
Note: As pointed out by gn#36, phpBB doesn't use persistent connections at all.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10375 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-23 15:07:52 +00:00
Nils Adermann
9ad40c8821 Send statistics now check for IPv6 and send private network status as a boolean
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10370 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-23 02:53:56 +00:00
Andreas Fischer
d0c596a5ea Add ability to disable overall (aka board-wide) feed.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10363 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-22 19:21:41 +00:00
Joas Schilling
1261e21eac Bug #55665 - Restrict search for styles/../style.cfg to folders.
Authorised by: bantu

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10360 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-21 22:29:28 +00:00
Andreas Fischer
7d406a36cd All topics feed now returns newest board topics. Reduce required queries and complexity.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10350 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-20 00:05:47 +00:00
Andreas Fischer
4e49152529 Use correct limit config parameter in the News feed.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10346 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-17 00:41:30 +00:00
Andreas Fischer
69c07b8330 News feed: Correctly handle global announcements.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10345 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-17 00:39:41 +00:00