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

7848 Commits

Author SHA1 Message Date
Meik Sievertsen
9f0b6766f9 Fix for r8752
(the code removed actually was quite important - this checkin merges this with the new code)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8970 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-06 05:44:32 +00:00
Meik Sievertsen
059acbcd1d changelog entry for security-relevant change
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8969 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-02 12:09:14 +00:00
Meik Sievertsen
2c1d80c75a Remove NUL-Bytes directly in request_var() for strings and within the custom DBAL sql_escape() functions (MSSQL, Firebird, Oracle) (reported by AdhostMikeSw)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8967 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-02 12:04:12 +00:00
Meik Sievertsen
ed4797bb4e Check users pm preferences for pm's sent to groups. (Bug #33245)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8964 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-30 15:49:10 +00:00
Meik Sievertsen
a87d283f7b unique faq id's in template - #33775
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8963 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-30 15:38:55 +00:00
Meik Sievertsen
d8c6fc6792 don't know any better sentence... suggestions welcome. :)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8962 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-30 15:31:51 +00:00
Meik Sievertsen
88e56ee90c Wrong parameter count for preg_replace in get_context() (IMO we need no limit there - nils, you may check this again to be sure) - #34135
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8960 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-30 15:13:20 +00:00
Henry Sudhof
d6843ca960 #34815 - thanks for the patch, but actually it was just a whitespace
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8958 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-30 12:53:20 +00:00
Meik Sievertsen
77cf8e50d9 further adjustments to exit; statements
force E_USER_ERROR to exit *always* - it is always a fatal error which should stop every execution happening

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8957 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-30 09:49:20 +00:00
Meik Sievertsen
eef41d039e check fields properly not being set sometimes. ;)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8956 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-29 16:55:23 +00:00
Meik Sievertsen
1f01089e2f 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)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8955 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-29 15:58:42 +00:00
Meik Sievertsen
0a98003d91 revert r8893 - there were massive problems with the display and select all code
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8953 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-28 17:08:09 +00:00
Chris Smith
7de4563d05 Add quoting support to PM history when composing a reply. #34285
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8951 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-27 11:38:42 +00:00
Chris Smith
6cfc56a650 Better return links when deleting topics through the MCP. #34655
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8950 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-27 10:59:25 +00:00
Chris Smith
92c759456d Small language fix (#32795) and tiny bug fix
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8949 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 21:29:05 +00:00
Chris Smith
abff17ba87 Remove reference to old mysql4 abstraction layer. #26065
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8947 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 18:43:34 +00:00
Chris Smith
e216651119 More language fixes. #34185
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8946 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 18:32:05 +00:00
Chris Smith
7e0ae65c68 * Use a distinct log message for shadow topic deletions to differentiate between normal topic deletions. #34635
* Fix a small typo in r8942


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8945 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 18:29:20 +00:00
Meik Sievertsen
3b42ffcc9e nitpick alarm. ;)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8944 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 13:14:11 +00:00
Meik Sievertsen
2bf9ea373b Fix problems with styles using an underscore within the filename. (Bug #34315)
- Also display inheriting template on style installation (previously, it was only displayed on template installs)
- Fixes undefined variable in error message if inheriting style does not work
- Fixes export of styles/templates and correctly set inherit_from variable

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8943 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 13:09:56 +00:00
Chris Smith
c0f6538cf6 Duplicate log messages for deleting a topic ('LOG_TOPIC_DELETED' has been deprecated in favour of 'LOG_DELETE_TOPIC').
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8942 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 12:42:47 +00:00
Chris Smith
c1407d8047 Split posts target forum requires 'f_post' now instead of 'm_split'. #31015
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8941 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 11:56:33 +00:00
Chris Smith
b9cd8f2966 Add links to the post and forum when viewing a report from the MCP. #33795, #33805
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8940 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 11:25:04 +00:00
Chris Smith
3b25f4b180 Fix a tricky little bug in r8909
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8938 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 09:19:23 +00:00
Chris Smith
a75fd80305 A fix for the fix in r8934. #34525
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8936 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-24 19:08:14 +00:00
Chris Smith
0cd7d50fb9 We want our PM spam back. Fix a regression introduced in r8913, preventing users from sending PMs. #34525
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8934 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-24 18:39:50 +00:00
Meik Sievertsen
936f7d43f0 better query for syncing post counts. Thanks to BartVB for this. ;)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8932 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-24 13:57:13 +00:00
Henry Sudhof
1e7a75db8f Do not include hash in redirect back
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8930 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-24 12:23:57 +00:00
Henry Sudhof
f761a26e8d Make pagination work again, undoing rev8830 to fix #32515 properly
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8929 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-24 11:41:51 +00:00
Henry Sudhof
7fed490277 should make last_active work again
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8928 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-24 11:32:25 +00:00
Henry Sudhof
3bcf4ecd96 Show headers if no leaders are on the page
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8927 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-24 10:43:00 +00:00
Chris Smith
40ae0658f0 Adjust language key SPLIT_AFTER to make the action clearer.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8926 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 21:39:59 +00:00
Chris Smith
b812f81ac4 MCP topic view checkboxes now default to unchecked.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8925 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 21:15:10 +00:00
Chris Smith
9c5a3cca89 Stop users from deleting posts after the edit time has passed or they have been locked. #19115
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8924 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 18:04:52 +00:00
Chris Smith
e0fe6948d6 Make topic selection for merge less confusing by removing unneeded controls. #21925
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8922 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 16:22:15 +00:00
Meik Sievertsen
4655e11edf gah
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8920 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 14:40:10 +00:00
Meik Sievertsen
a77afcea34 err, i am <insert name here>
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8918 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 14:11:51 +00:00
Meik Sievertsen
52f844dce5 duplicate key
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8917 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 13:42:05 +00:00
Meik Sievertsen
1dc9f30a8b remove exit statement and make sure no "additional" code gets executed
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8915 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 13:30:52 +00:00
Meik Sievertsen
c5b88e8481 - Automatically add users/groups to the PM recipient list, if entered or selected.
- Reply to PM now includes all previous recipients and not only the original sender.
+some changes required to implement max_recipient feature and new permission

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8913 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 13:04:27 +00:00
Meik Sievertsen
9bb0d6e76d synchronise post count in steps
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8912 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 13:03:52 +00:00
Meik Sievertsen
4a3db854b7 - Added 'max_recipients' setting for private messages. This setting allows admins to define the maximum number of recipients per private message with a board-wide setting and a group-specific setting.
- Added new permission setting for sending private messages to groups. Now there are two permissions to define sending private messages to multiple recipients and private messages to groups.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8911 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 13:03:33 +00:00
Chris Smith
38afbf6759 Correctly handle unread status of subforums (that are not shown on the index) of forums that are shown on the index. #14589
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8909 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 12:07:34 +00:00
Chris Smith
687da94982 Log the forum name that topics are moved into.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8908 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 12:01:26 +00:00
Henry Sudhof
a1b7a5f8a3 whitespace
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8906 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-22 13:32:58 +00:00
Henry Sudhof
e1d1c6039b adding more hashes
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8904 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-22 13:25:28 +00:00
Meik Sievertsen
20f9b87f04 Fix sql_multi_insert() if called with non multi-dimensional array (Bug #32975)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8900 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 17:12:04 +00:00
Meik Sievertsen
0b0da7b333 do not allow categories to be locked by accident (Bug #14548)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8898 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 17:07:13 +00:00
Meik Sievertsen
dd75418c4a language correction (Bug #23955)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8896 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 16:59:40 +00:00
Meik Sievertsen
0c45e8e13d remove unused code
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8895 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 16:54:03 +00:00