History | View | Annotate | Download (41.5 kB)
commit 6ff403c9f8fd19e5ddf81fdf3e8bb27018b519b9Merge: 832b09d 9819700Author: Andreas Fischer <bantu@phpbb.com>Date: Wed Oct 27 13:06:21 2010 +0200
Merge branch 'ticket/cs278/9061' into develop-olympus
commit c8bb9a2d37babae707a2006b8027e96d5758d940Merge: 18079d0 2f312b2Author: Andreas Fischer <bantu@phpbb.com>Date: Sat Jul 31 02:04:54 2010 +0200
Merge branch 'ticket/jellydoughnut/9559' into develop-olympus
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. Themessenger class uses set_custom_template() to initialise the template object...
Further fixes for r10447 and r10448. Correctly account for custom language directories (caught by naderman)
Remove needless check (revising r10447)
Fall back to board default language email template if the file does not exist user's preferred language (#35595)
Fix getting host for situations where the name/IP is not resolvable. Related to Bug #41025Related revisions: r9387 and r10158
extend r9387 - check for existance of all functions we use...
Fix #51285 and more issues with template inherence on set_custom_templateConflict introduced with r9839 and r9823
Authorised by: AcydBurn
Fix possible wrong encodings in email template files in messenger. Related to bug #46725
we will use the non-compliant way for mail() until we further inspected PHP's source.
Fix email problems on servers with PHP installations not accepting RFC-compliant subject string passed to the the mail()-function. (Bug #46725)
Per RFC2047 section 5 do not use quoted strings for encoded recipient names
allow custom template path for email files
Parse email text files with the template engine.Did not check if this influences styles template cache list/purge/etc.
Correctly split UTF-8 encoded strings when using mail(). #45815
Messenger now also able to use a custom language path. (Bug #36545)
fix revision #r9430 - all hail the math!
Correctly split long subject lines according to the used RFC. This fixes extra spaces within long subjects. (Bug #43715)
Erm, yes, we use EOL in queue too. :/ (me is ashamed). Paul, thanks for giving me access to debug this.
make sure eol is set (if PHP_EOL is empty? :o)
Mass Email works again for users with empty jabber address but notification set to 'both'. (Bug #39755)
Use FQDN for SMTP EHLO/HELO command. (Bug #41025)
Use OS-specific line endings for mail headers. (related to Bug #42755)
add IN_PHPBB check to generated cache files
Missing read permission from calls to phpbb_chmod()
Do not try to send jabber notifications if no jid entered (Bug #36775)
some whitespace changes and opening files in binary mode in functions_messenger
Use phpBB 3.1.x method for storing cached data to prevent PHP bug with our usage of var_export(). (Thanks to Techie Micheal and HoL for pointing out possible problems)
change the way we do chmodd'ing. I know, my implementation really sucked... good we have motivated community members who point this out. ;) Thanks to faw for providing a way better function and for discussing and also abiding to our needs. :) LEW21 should maybe credited too... he gave the inspiration without knowing it.
the chmod change i already had within the changelog (by mistake). This should further secure writable directories and created files.Installation need to be tested on different hosts.
Hiding everywhere little buggers, eh?
Do not error out if php_uname function disabled / Authenticating on SMTP Server (Bug #22235 - patch by HoL)
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
some further fixes- re-introduce grabbing random number from /dev/urandom
fixing tiny bugs
dumdidum... sorry. ;)
- correct jabber token handling- undisclosed-recipients:; instead of undisclosed-recipient:;- PM details button should not be there
fixing some bugs
- two new packages... diff and utf- only 60 chars for topic title if new post (please see changelog for explanation)- change utf8_wordwrap (had some bugs david and nils spotted - was not really functional, sorry for this. :D)
some bugs fixed
Some changes... non-invasive...
again, a lot of bug fixes
let's see if i can break something. :o
some fixes...
ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!)
oi^2
hopefully not too late in the game. Checked in new jabber class (the class done by the flyspray project). It would be nice if this could be tested with more servers - jabber.org seems to work fine...- other fixes
Disable DEBUG by default, enable backtrace by default
:(
fopen + fread + fclose -> file_get_contents
fixing some bugsmore mcp links for easier moderating different aspects (all, forum, topic)i may have introduced new bugs with this commit due to me having fixed some things weeks ago and some code changed in between - please report if you see something not working as expected.
those were missing
- fix some oddities (doubled spaces for example)- changed the way make_forum_select() is returning the forum list - now including skipped forums but being disabled. This should make identifying the correct forum much more easier.- Changed some permission namings based on suggestions by the community...
fixing some bugs, most being submitted grammatical/spelling errors.
tiny alterations
forgot to add true to the var_export function. :(
- use var_export instead of our format_array function [Bug #6748]- fix dumb error in column naming [Bug #6750]- Make sure to catch some special conditions for cpf translation as well as correctly removing/adding default values on language installation/removing [Bug #6752]
fix typo
- telling the admin for what the board contact and board email addresses are used for and also making sure this explanation is correct ;)- fixes for bugs #6694, #6664 and #6662
some fixes today- most important change is the consolidation of the display attachment functions; merging them together to have one function we need to call.
- we need at least 4.3.3, "phpversion() < '4.3'" will always be false
fix for bug #6140 (jabber not working)
changes to how errors are processed by the messenger
by the power of math!
rather large update, most important things done:- implemented provided patch/diff file for bug #5350 (Highway of Life) with some tiny changes and alterations- more username/colour changes/fixes- added a note about PM rule-dependant message removals so the user is not wondering too much if he can't remember his rules. :)...
davidmj came up with a simpler (and working in all cases!) approach. :) Bow to him...
do not process if all ASCII
new mail_encode function to make sure we abide to the rfc but not split in-between of multibyte characters. The used method is not 100% accurate, but a good compromise between compatibility, conformance and performance.
decrease the barrier for E_ALL error reporting and email traces from DEBUG_EXTRA to DEBUG
ok, this should work now for mail() and smtpmail. We also removed the newline from the spacer for mail_encode due to php's mail() function choking up on subjects with newlines.
seems like capitalizing menu titles introduced some problems. :) Also it might look strange for some languages - so therefore it is better be done within the language file directly.
let utf8 mails work again. I hope this is not giving problems for "strange" mail setups.
ok, i am an idiot...
- make sure the sql layer for mysql always states mysql4 and get to mysql if using mysql < 4- assign some default vars to email templates (we always need some basic ones)
some fixes
- extend config checking to include check for writeable path- removed not utilized user_allow_email column from schema- removed inactive groups (they had no use at all, since inactive users are not able to login) The only benefit those brought are distinguish users - but this is no longer needed too due to the inactive code present. This also allows us to retain group memberships as well as default settings for users being set inactive due to profile changes....
made sql_rowseek consistent with the dbal methods as well as fixing sql_query_limit for mssql, especially if sql_query_limit($sql, 0, 0) is given...
- no more encoding mixture, say hello to UTF-8 (I'll add a validation solution for PHP 4.3.3/4 ASAP) [side effect: fixes Bug #3762]- take local server time into consideration for birthday/age calculation- faster active topic search- allow changing active topic time frame [Bug #4150]...
- fix security issue in download.php- fixing some phpdocumentor warnings/errors- adjust pop-before-smtp "auth" (nowadays no one should rely on it)- add backtrace for smtp email errors if DEBUG_EXTRA is enabled
some updates. Also adjusted the utf tools and normalizer more to our coding guidelines.
revert a change i made (we already adjust line endings to be rfc-compliant and use \n for the php mail function as suggested by the manual)
some bugfixes
time to squash some bugs
make sure custom profile fields are created correctly on registration (#2225)
Only create a session if on doesn't exist. In theory, checking for the presence of a sid should be enough to determine this.....
- fixed a few bugs- added user_add() function- check posted images ([img]) for same domain/scipt and php files- auth_api.html updated to the coding guidelines look&feel- introduced ability to force non page-updates (cron is using it)- correctly resend coppa email
- allow searching for post_count = 0 [Bug #2154]- better permission check for user search by ip- permissions for max attachments adjusted
This looks a bit like an ugly hack, I know :(But hopefully it will solve most of our encoding problems with jabber [Bug #1585]
ok, this one is rather large... the most important change:re-introduce append_sid: old style continues to work, not a performance hog as it was in 2.0.x -> structure is different
apart from this, code cleanage, bug fixing, etc.
- remove description from profile fields- added disclaimer about DEBUG_EXTRA to the ACP (i think this is needed - some idiots might think it is wise to have this enabled on a production board. :) We may let it there for the Betas though, but it will be removed during the RC's)...
some tiny changes...
give location for missing email files for better support
empty is only accepting vars
- use php_uname('n') instead of posix_uname and HTTP_HOST- updated the authors file a bit
reverting changes to the installerdo not introduce a function we never call outside of common.php
- allow searches for multibyte characters in fulltext_native- use preg_quote safely
