1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

1183 Commits

Author SHA1 Message Date
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
Andreas Fischer
2906a24122 Bug #56545 - Speed up topic move operation by adding an index for topic_id on the topics track table.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10462 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-28 23:15:25 +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
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
Andreas Fischer
5306a586b1 Revert r9564, Fix #54445, Related to #44665.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10445 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-25 18:42:04 +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
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
749fe6f9d0 Turn all forums feed off by default.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10373 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-23 02:59:44 +00:00
Andreas Fischer
736f26dea1 Reflect changes in schema data. This should also close #55775 ;-)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10371 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-23 02:55:28 +00:00
Andreas Fischer
a4cee51de5 Split feed_limit into feed_limit_post and feed_limit_topic. Drop feed_overall_topics_limit.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10366 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-23 02:30:37 +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
Andreas Fischer
bc0cc313df Bump database updater version to 3.0.7-dev
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10362 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-22 18:13:17 +00:00
Andreas Fischer
db46647c9e Fix Bug #54815 - Only replace table prefix if table name is surrounded by whitespace.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10300 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-07 12:56:17 +00:00
Nils Adermann
fe6958d54f PHP 5.3 compatibility: Disable E_DEPRECATED on startup to keep set_magic_quotes_runtime(0) quiet. [Bug #54495]
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10299 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-06 02:30:24 +00:00
Andreas Fischer
a5c9a2f36e Since dl() is deprecated and disabled by default in PHP 5.3, calling it will result in a fatal error for an undefined function and because of the error suppression in a blank page. Checking if dl() exists should allow most boards to continue right away. - Bug #54665
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10298 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-04 11:50:03 +00:00
Andreas Fischer
f59a9221e9 Fix Bug #53965, Regression introduced in r9768 - Hardcode language for the time being.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10271 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-15 22:30:07 +00:00
Andreas Fischer
e4d1addc2c Fix Bug #53945 - Typo in r10267.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10269 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-14 21:27:24 +00:00
Meik Sievertsen
46112228c0 Tag as 3.0.6
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10267 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-14 20:11:38 +00:00
Meik Sievertsen
5553cfc2ed Several fixes:
Fix Bug #53335
Fix wrong unique index fetch for oracle and sqlite
Fix alter column definition for firebird (although the query will fail in these circumstances [primary key] because firebird (again) does not support simple things... although... mssql/oracle having the same "problems", but there you are able to do more advanced queries)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10248 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-30 19:19:48 +00:00
Meik Sievertsen
110f81684e I am very sorry... but the changes require (a hopefully very short) RC4 phase
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10241 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-28 16:05:17 +00:00
Meik Sievertsen
30f3ba83e3 sneaks in and changes the version number. Seems like we see no RC4...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10228 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-22 14:35:56 +00:00
Meik Sievertsen
08437d1538 update constants and schema data from RC2 to RC3
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10220 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-11 09:56:47 +00:00
Meik Sievertsen
d94da30c5d correctly execute database update step (detect if the version the admin wants to update to is greater than the current version even if phpbb.com says the current version is lower than the update version) which correctly updates the database for those who forgot to enable the PHPBB_QA constant for release candidates.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10218 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-09 11:59:54 +00:00
Meik Sievertsen
8525e97c28 Bug #52415
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10205 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 11:10:16 +00:00
Meik Sievertsen
3e0bf1f8a4 prepare for RC2
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10187 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-25 09:41:49 +00:00
Meik Sievertsen
023760c8b2 I think i need to check other DBMS more often. :/
- fix index check for sqlite, firebird and oracle
- add check for unique index
- fix changing default value for column in mssql (add constraint)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10185 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-24 15:36:05 +00:00
Meik Sievertsen
54c22ae52a remove log_time index (was not used at all)
At the same time the database updater now supports checking for existing indexes. The db tools will not have this in 3.0.6 (the db tools have a function to retrieve all indexes) and i need to test the updater on all DBMS today...

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10183 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-24 08:53:17 +00:00
Meik Sievertsen
7a244e1d2b if preserve_cr is true and the file generated no conflict but is obviously not "empty" we tag it as modified because preserve_cr is the default mode for showing modifications (else the user gets a resolvable conflict and may wonder why ;))
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10167 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-20 16:18:41 +00:00
Meik Sievertsen
38c4bcad55 Ok, after 20+ hours i think i fixed all grave issues with the updater
- smaller memory footprint
- better checks for already updated files
- even less conflicts
- fixed automatic conflict resolving after successful merges
- no more conflicts for $Id$ changes
- fixed skip_whitespace_changes bug where code blocks were added to diff_op_add whereby the previous or next diff_op_copy already had the change
- correctly display merged files in diff view (previously it happened that the old file was used for comparision, although the new file was different/newer/merged)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10163 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-18 18:18:54 +00:00
Meik Sievertsen
c616b2b336 fix coppa setting in convertor (Bug #50735) - at the same time increase target phpBB version number for the phpBB2 convertor and convertor version number. ;)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10148 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-15 19:01:42 +00:00
Andreas Fischer
a5ec35e185 Fix database updater for PostgreSQL: Data needs to be GROUPed BY left_id, before we can ORDER BY left_id. Introduced in r10072.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10130 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-10 08:58:24 +00:00
Andreas Fischer
fc5a21e16a Revert r10106 - Index usage is very unlikely because of WHERE IN (). :-|
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10107 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 17:27:13 +00:00
Andreas Fischer
0fe74ebcea Add INDEX on user_regdate because this is the default ORDER BY in memberlist.php - thanks nickvergessen.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10106 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 15:44:10 +00:00
Meik Sievertsen
31856352be Change version numbers to 3.0.6 and 3.0.6-RC1 for a final internal test run
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10105 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 15:19:26 +00:00
Meik Sievertsen
2b5f04cf1c changes for a little internal update test run
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10098 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-04 10:25:31 +00:00
Meik Sievertsen
254dee274c erm, wrong position
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10084 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-01 15:07:26 +00:00
Joas Schilling
139f1d3530 fix r10076 for #48615 - Ability to specify amount of time user is able to delete his last post in topic.
Authorised by: AcydBurn


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10080 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-31 14:57:04 +00:00
Meik Sievertsen
0dc8f103c9 ok, now we just define the modules we want to install on update and where they should appear.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10072 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-31 09:38:53 +00:00
Andreas Fischer
bc63b8685c Addition to r9887: Correctly install 'Copy forum permissions' module.
Addition to r10068: Correct mode is send_statistics.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10070 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-31 08:58:44 +00:00
Meik Sievertsen
3f22f755a3 correct mode is send_statistics, else installs will differ from updates.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10068 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-30 17:22:21 +00:00
Joas Schilling
c52f05b332 Fix Bug #49195 - Queries on un-indexed column user_email
Added function to generate email-hash.

Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10060 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-28 09:26:43 +00:00
Andreas Fischer
9382f6ba17 Fix bug #50245 - Check for correct module name when installing the "Send statistics" module.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10049 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-24 00:29:23 +00:00
Meik Sievertsen
9666983c69 also populate forum_options on conversions
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10028 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-20 12:19:12 +00:00
Andreas Fischer
5ecc57b87e Tiny typo change to r9743, #46425.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10013 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-18 08:22:17 +00:00
Meik Sievertsen
b4baa6a094 Lifted minimum requirement for Firebird DBMS from 2.0+ to 2.1+.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9970 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-13 15:25:20 +00:00
Nils Adermann
4525d1cb73 - links to send statistics after install and update
- link back to ACP main from send statistics
- improved language / better explanation (incl. Bug #48555)



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9969 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-13 14:51:47 +00:00
Meik Sievertsen
09ad10a734 ok, i am very sorry, but this needs to be fixed.
Generally, our config table is not really suited for holding large datasets. Because feed settings for the forums to enable news feeds and excluded forums rely on the forums itself we have decided to introduce a forum_options table where custom options can be stored.
Additionally, for this to work across all DBMS we support, we added a new method to the DBAL for the bitwise AND operator.
Also moved the forum/topic feed template variable to the location where they belong to (forum and topic view)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9965 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-12 15:00:47 +00:00
Meik Sievertsen
96a30afcca do not change column if column already exists.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9956 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-11 14:49:58 +00:00
Andreas Fischer
e5fadfd42b Bugs #15809, #49215 - Allow updater to work correctly with PHP filename extensions other than .php.
Related revisions: r9935, r9936

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9948 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-10 12:12:45 +00:00
Andreas Fischer
090ab9bf05 Bug #49215 again.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9936 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-07 12:50:25 +00:00