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
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
0a4c62f12e
Merge in r8924, r8925, r8926, r8936, r8938
...
git-svn-id: file:///svn/phpbb/trunk@8939 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 09:28:12 +00:00
Marek A. R
1cc419fb4c
Fix typos
...
git-svn-id: file:///svn/phpbb/trunk@8937 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-25 19:55:04 +00:00
Chris Smith
f6a47c6f82
Merge in r8934
...
git-svn-id: file:///svn/phpbb/trunk@8935 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-24 18:41:06 +00:00
Meik Sievertsen
10d3191198
better query for syncing post counts. Thanks to BartVB for this. ;)
...
git-svn-id: file:///svn/phpbb/trunk@8933 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-24 13:58:50 +00:00
Henry Sudhof
9f9a89c78e
Merging 8927, 8928, 8929, 8930
...
git-svn-id: file:///svn/phpbb/trunk@8931 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-24 12:29:57 +00:00
Chris Smith
884cde18fe
Merge in r8922
...
git-svn-id: file:///svn/phpbb/trunk@8923 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 16:31:45 +00:00
Meik Sievertsen
ec1be2563c
gah^2
...
git-svn-id: file:///svn/phpbb/trunk@8921 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 14:40:20 +00:00
Meik Sievertsen
ec88ec534b
here too
...
git-svn-id: file:///svn/phpbb/trunk@8919 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 14:14:33 +00:00
Meik Sievertsen
bb97d3531a
remove exit statement and make sure no "additional" code gets executed
...
git-svn-id: file:///svn/phpbb/trunk@8916 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 13:31:04 +00:00
Meik Sievertsen
ce6b87ccec
- 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.
- 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/trunk@8914 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 13:11:34 +00:00
Chris Smith
b486710ea1
Merge in r8843, r8908, r8909
...
git-svn-id: file:///svn/phpbb/trunk@8910 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 12:56:34 +00:00
Meik Sievertsen
aa9dbcec3c
short php open tags should not be used. :) A lot of users (including myself) do not allow them.
...
git-svn-id: file:///svn/phpbb/trunk@8907 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-22 17:51:43 +00:00
Henry Sudhof
08428f8fa1
merging 8904
...
git-svn-id: file:///svn/phpbb/trunk@8905 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-22 13:32:28 +00:00
Henry Sudhof
0f14f278d0
fixing some vC bugs (attempt counting and posting) and introducing prototype for reCaptcha
...
git-svn-id: file:///svn/phpbb/trunk@8903 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-22 12:37:42 +00:00
Meik Sievertsen
c67fa83652
remove some spaces
...
git-svn-id: file:///svn/phpbb/trunk@8902 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-21 10:14:17 +00:00
Meik Sievertsen
1f6eea1b5b
Fix sql_multi_insert() if called with non multi-dimensional array (Bug #32975 )
...
git-svn-id: file:///svn/phpbb/trunk@8901 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 17:13:22 +00:00
Meik Sievertsen
6f0ea3c9d2
do not allow categories to be locked by accident (Bug #14548 )
...
git-svn-id: file:///svn/phpbb/trunk@8899 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 17:07:45 +00:00
Meik Sievertsen
8fd7f16642
language correction (Bug #23955 )
...
git-svn-id: file:///svn/phpbb/trunk@8897 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 17:00:26 +00:00
Meik Sievertsen
80ced5c0b7
support tabs in code selections (Bug #25445 ). Still does not solve the strange "4 spaces prefixed on every line" problem in firefox. :/
...
git-svn-id: file:///svn/phpbb/trunk@8894 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 16:42:55 +00:00
Henry Sudhof
01c1c27f2c
meh
...
git-svn-id: file:///svn/phpbb/trunk@8892 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 16:18:59 +00:00
Meik Sievertsen
eee2f89ace
Correctly delete message attachments. (Bug #23755 ) Also revamped and simplified delete_attachments() - it looks like we did not touch it for a long long time.
...
git-svn-id: file:///svn/phpbb/trunk@8891 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 15:42:33 +00:00
Henry Sudhof
461be11e8d
Okay, that is pretty raw, but better to have it in place than trying to play catch-up. Introducing an early stage of CAPTCHA modules.
...
git-svn-id: file:///svn/phpbb/trunk@8889 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 13:17:30 +00:00
Meik Sievertsen
5349280538
Pass S_SEARCH_ACTION through append_sid() in search.php. (Bug #21585 )
...
git-svn-id: file:///svn/phpbb/trunk@8886 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-18 15:25:45 +00:00
Meik Sievertsen
24da8c474d
remove duplicate statement
...
git-svn-id: file:///svn/phpbb/trunk@8884 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-18 15:06:23 +00:00
Meik Sievertsen
158a15ba9c
Reset login attempts on new password activation. Prevents "first failed login attempt" on converted boards. Bug #19965
...
git-svn-id: file:///svn/phpbb/trunk@8882 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-18 14:50:50 +00:00
Meik Sievertsen
958d077faa
Fix native full text search on postgresql while using excluding keyword matches. (Bug #19195 )
...
git-svn-id: file:///svn/phpbb/trunk@8880 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-18 14:32:51 +00:00
Meik Sievertsen
4649b93e0d
Prevent integer overflow - Bug #19895
...
git-svn-id: file:///svn/phpbb/trunk@8877 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-18 14:27:27 +00:00
Meik Sievertsen
2fc6d5147a
Set secure cookie for style switcher if required. (Bug #19625 )
...
git-svn-id: file:///svn/phpbb/trunk@8875 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-18 14:17:39 +00:00
Meik Sievertsen
e2736dea20
Display assigned rank/avatar for guests. (Bug #19155 )
...
git-svn-id: file:///svn/phpbb/trunk@8873 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-18 13:36:40 +00:00
Meik Sievertsen
76c0e5aa5e
Do not allow setting forums parent to the forum itself. (Bug #18855 )
...
git-svn-id: file:///svn/phpbb/trunk@8871 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-18 13:22:15 +00:00
Meik Sievertsen
d135060c12
#18175
...
git-svn-id: file:///svn/phpbb/trunk@8869 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-17 15:52:21 +00:00
Meik Sievertsen
3b79fd122e
Use correct port delimiter for MSSQL connections in windows. (Bug #16615 )
...
git-svn-id: file:///svn/phpbb/trunk@8867 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-17 15:12:31 +00:00
Meik Sievertsen
b6949c47ec
Preserve alpha transparency for created thumbnails. (Bug #16575 )
...
git-svn-id: file:///svn/phpbb/trunk@8865 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-17 14:59:53 +00:00
Meik Sievertsen
235f552974
Expand shown ban reason in unban screen to fully show long entries. (Bug #16234 )
...
git-svn-id: file:///svn/phpbb/trunk@8863 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-17 14:50:48 +00:00
Meik Sievertsen
1651c5df57
Display popular topic based on posts within topic instead of replies within topic. (Bug #16099 )
...
git-svn-id: file:///svn/phpbb/trunk@8861 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-17 14:31:32 +00:00
Meik Sievertsen
17ec98b834
simplify $user->img()
...
git-svn-id: file:///svn/phpbb/trunk@8859 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-16 15:15:03 +00:00
Meik Sievertsen
cc5d77e06d
make topic icon image width/height available to viewforum and search templates (Bug #15934 )
...
git-svn-id: file:///svn/phpbb/trunk@8858 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-16 15:07:38 +00:00
Meik Sievertsen
2eeeaadcfd
emails to e-mails
...
git-svn-id: file:///svn/phpbb/trunk@8856 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-16 13:21:12 +00:00
Meik Sievertsen
de0bc7476a
Do not display reported topic icon for shadow topics. (Bug #13970 )
...
git-svn-id: file:///svn/phpbb/trunk@8854 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-16 12:51:36 +00:00
Meik Sievertsen
ca07af715f
Fix Wrong table order in query obtaining posts if post id given. In MSSQL there is an sql error due to this bug.
...
git-svn-id: file:///svn/phpbb/trunk@8852 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-16 12:37:33 +00:00
Meik Sievertsen
46b4d09e3a
add missing dot. :)
...
git-svn-id: file:///svn/phpbb/trunk@8849 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-16 11:42:09 +00:00
Meik Sievertsen
af26b56470
more in-depth hostname validation. Not used in install files... there the code is fine.
...
There are ways to improve this, either a whitelist or "more guessing"
git-svn-id: file:///svn/phpbb/trunk@8847 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-15 18:43:24 +00:00
Henry Sudhof
310375db66
Merge 8844, Bug #34045
...
git-svn-id: file:///svn/phpbb/trunk@8845 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-15 11:44:25 +00:00
Chris Smith
e5425dfd46
Merge in r8840
...
git-svn-id: file:///svn/phpbb/trunk@8841 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-11 00:32:02 +00:00
Chris Smith
0e0100c525
merge r8829, r8830, r8831, r8832, r8833, r8834, r8835, r8836, r8837, r8838
...
git-svn-id: file:///svn/phpbb/trunk@8839 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-08 13:39:34 +00:00
Chris Smith
a32f3a6709
Merge in r8827
...
git-svn-id: file:///svn/phpbb/trunk@8828 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-05 13:49:04 +00:00
Chris Smith
10c8d29205
Merge in r8825
...
git-svn-id: file:///svn/phpbb/trunk@8826 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-05 12:52:00 +00:00
Chris Smith
6f754d49e4
Remove a useless str_replace()
...
git-svn-id: file:///svn/phpbb/trunk@8823 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-05 12:41:08 +00:00