Commit graph

9786 commits

Author SHA1 Message Date
Chris Smith
c969d4f83f Display a message if no topics or forums are selected when unsubscribing. #34855
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8997 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-11 14:31:22 +00:00
Chris Smith
5ce6035aad Merging r8993, r8994, r8995
git-svn-id: file:///svn/phpbb/trunk@8996 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-10 17:58:32 +00:00
Chris Smith
980cb2e5bb Erm yeah that bit is kinda important (fixing r8993)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8995 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-10 17:56:59 +00:00
Chris Smith
55d8d97d2f Don't show forum subscription link on categories. #34895
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8994 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-10 17:52:14 +00:00
Chris Smith
b86722d509 Fix regression introduced in r8951 #34985
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8993 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-10 17:38:17 +00:00
Meik Sievertsen
b30abf821f Introduce new Changelog tag to indicate security related fixes which are there to prevent something which may be security wise borderline or being used to circumvent security. So, [Sec] is for those fixes for real exploits/vulnerabilities and [Sec Precaution] for those fixes which can be counted to the *Component* Security.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8992 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-10 14:46:44 +00:00
Meik Sievertsen
746b617807 Add two standard language items - #30885
Make sure users still get notifications if they set to only be notified by Jabber, but Jabber service disabled. (Bug #29715 - Patch by Paul)


git-svn-id: file:///svn/phpbb/trunk@8991 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-09 15:42:08 +00:00
Meik Sievertsen
c8cf5693b8 Make sure users still get notifications if they set to only be notified by Jabber, but Jabber service disabled. (Bug #29715 - Patch by Paul)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8990 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-09 15:41:19 +00:00
Meik Sievertsen
94f0047a9b Add two standard language items - #30885
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8989 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-09 15:31:56 +00:00
Meik Sievertsen
9c7d8dcd7d - Do not show link to user/group profiles if user has no permission to view the linked page and gets a denied message anyway. (Bug #15088)
- Do not display last post link and sort display options for search engines. (Bug #15088)


git-svn-id: file:///svn/phpbb/trunk@8988 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-09 14:22:07 +00:00
Meik Sievertsen
253f186322 - Do not show link to user/group profiles if user has no permission to view the linked page and gets a denied message anyway. (Bug #15088)
- Do not display last post link and sort display options for search engines. (Bug #15088)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8987 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-09 14:17:02 +00:00
Meik Sievertsen
73db74dfa1 Implemented strict check for cached user permissions and existing ACL options. This fix makes sure cached permissions are valid, even if they got already cached.
git-svn-id: file:///svn/phpbb/trunk@8986 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-09 13:19:36 +00:00
Meik Sievertsen
ab5146a72a Implemented strict check for cached user permissions and existing ACL options. This fix makes sure cached permissions are valid, even if they got already cached.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8985 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-09 13:18:38 +00:00
Meik Sievertsen
d4c8a078a2 Show coloured guest names correctly if not enclosed in <a> tags. ;) Bug #21935
git-svn-id: file:///svn/phpbb/trunk@8984 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-08 15:17:27 +00:00
Meik Sievertsen
aa27ec5ebb Show coloured guest names correctly if not enclosed in <a> tags. ;) Bug #21935
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8983 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-08 15:16:47 +00:00
Meik Sievertsen
9fdbe46c08 although outer loops work fine in inner loops (for some time now) using the full loop name is still the correct way to reference template loops.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8981 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-08 13:06:42 +00:00
Meik Sievertsen
9d9d61b1a2 Merge revisions:
r8974, r8975, r8976, r8977, r8978, r8979

git-svn-id: file:///svn/phpbb/trunk@8980 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-08 12:51:43 +00:00
Meik Sievertsen
73981ac5dc [Feature] Allow specific connection to different server for jabber functionality by providing a valid JID as username. This also allows the use of talk.google.com as jabber server with gmail.com JIDs. (Bug #14989)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8979 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-08 12:44:23 +00:00
Meik Sievertsen
d15751b149 thanks for the suggestions. :)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8978 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-08 11:38:10 +00:00
Meik Sievertsen
d8bb304210 Do not allow password reminders if u_passchg permission is not given. (Bug #14806)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8977 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-06 14:04:33 +00:00
Meik Sievertsen
b4d2641a59 Separate display of posted attachments in posting screen and switch for template to indicate adding attachments are allowed. Related to Bug #13871
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8976 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-06 13:53:18 +00:00
Meik Sievertsen
80b9fd04e0 Do not cut out permission reset options in IE7 - #13965
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8975 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-06 13:41:04 +00:00
Meik Sievertsen
dc4197d651 Sort topic icons/smilies by filename when adding new topics/smilies (Bug #13501)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8974 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-06 13:23:41 +00:00
Meik Sievertsen
dc8e30e734 Cottingham, not Cuttingham
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8973 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-06 10:22:55 +00:00
Meik Sievertsen
89f1b88fe1 merge r8970 and r8971
git-svn-id: file:///svn/phpbb/trunk@8972 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-06 05:52:49 +00:00
Meik Sievertsen
876b193180 some whitespace changes and opening files in binary mode in functions_messenger
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8971 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-06 05:50:16 +00:00
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
9a7804cb71 [Change] 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/trunk@8968 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-02 12:05:13 +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
Henry Sudhof
8f2b4562b1 meh
git-svn-id: file:///svn/phpbb/trunk@8966 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-01 11:14:48 +00:00
Henry Sudhof
18bfc5e69b and why not this as well?
git-svn-id: file:///svn/phpbb/trunk@8965 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-01 10:29:27 +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
ad4d7c036e merge r8956, r8957 and r8960
git-svn-id: file:///svn/phpbb/trunk@8961 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-30 15:18:35 +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
e4c3a743ca #34815
git-svn-id: file:///svn/phpbb/trunk@8959 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-30 12:55:48 +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
f3844a17f7 revert r8893 - there were massive problems with the display and select all code
git-svn-id: file:///svn/phpbb/trunk@8954 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-28 17:09:20 +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
c439b286e9 Merge in r8940, r8941, r8942, r8945, r8946, r8947, r8949, r8950, r8951
git-svn-id: file:///svn/phpbb/trunk@8952 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-27 11:45:30 +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
0b6dd99a76 tiny typo #34345
git-svn-id: file:///svn/phpbb/trunk@8948 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 21:27:31 +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