1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-10 01:25:33 +02:00

235 Commits

Author SHA1 Message Date
Meik Sievertsen
2e17e448de Copy 3.0.x branch to trunk
git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:14:59 +00:00
Meik Sievertsen
bf8ac19eaa Move trunk/phpBB to old_trunk/phpBB
git-svn-id: file:///svn/phpbb/trunk@10210 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-04 18:13:59 +00:00
Meik Sievertsen
1042152a55 Merge changes made in revisions #r9405 to #r9467
2009-04-18

git-svn-id: file:///svn/phpbb/trunk@9468 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-18 15:09:19 +00:00
Meik Sievertsen
4cbf6bc703 Merge most changes from 3.0.x branch since the 25th december.
(Captcha changes for refreshing captcha image not included)

git-svn-id: file:///svn/phpbb/trunk@9404 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-22 16:34:26 +00:00
Meik Sievertsen
84f795e9fb $db-> to phpbb::$db->
git-svn-id: file:///svn/phpbb/trunk@9336 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-22 18:06:05 +00:00
Meik Sievertsen
95b69cfa7f $auth-> to phpbb::$acl->
git-svn-id: file:///svn/phpbb/trunk@9335 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-22 15:48:29 +00:00
Meik Sievertsen
794c574969 remove global and change $user-> to phpbb::$user->
git-svn-id: file:///svn/phpbb/trunk@9334 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-22 15:29:18 +00:00
Meik Sievertsen
19aed179e5 $config to phpbb::$config
git-svn-id: file:///svn/phpbb/trunk@9242 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-28 23:30:09 +00:00
Meik Sievertsen
5b9a3c9a7d add nils' request and super globals class
rename request:: to phpbb_request::

git-svn-id: file:///svn/phpbb/trunk@9230 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-25 14:47:57 +00:00
Nils Adermann
07e9b83a3d - updated all code to use the request class instead of any direct access to
super globals
- disabled super globals in common.php. See commit r9101 for
  more information
- cleaned up/simplified a few lines along the way.

git-svn-id: file:///svn/phpbb/trunk@9102 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-24 00:20:33 +00:00
Chris Smith
ef0c0d4c82 been a while :( ... merge in r8997, r8998, r8999, r9000, r9001, r9002, r9003, r9004, r9005, r9007, r9008, r9009, r9010, r9011, r9012, r9013, r9014, r9015, r9022, r9023, r9029, r9030, r9034, r9048, r9049, r9054, r9056
git-svn-id: file:///svn/phpbb/trunk@9064 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-13 13:04:54 +00:00
Meik Sievertsen
589db44b56 Merge of the language-specific custom path change Revision #r8782
git-svn-id: file:///svn/phpbb/trunk@8786 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-24 10:04:15 +00:00
Meik Sievertsen
ad739a358c merge? merge.
git-svn-id: file:///svn/phpbb/trunk@8672 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-23 18:22:44 +00:00
Meik Sievertsen
7524ca5249 do not allow [flash=0,0]... not implemented for images due to the reliance on getimagesize() - as usual both sizes are able to be limited by the maximum/minimum image size configuration options
git-svn-id: file:///svn/phpbb/trunk@8614 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-07 13:42:06 +00:00
Meik Sievertsen
2f4a618900 ok... i hope i haven't messed too much with the code and everything is still working.
Changes:
- Ascraeus now uses constants for the phpbb root path and the php extension. This ensures more security for external applications and modifications (no more overwriting of root path and extension possible through insecure mods and register globals enabled) as well as no more globalizing needed.
- A second change implemented here is an additional short-hand-notation for append_sid(). It is allowed to omit the root path and extension now (for example calling append_sid('memberlist')) - in this case the root path and extension get added automatically. The hook is called after these are added.

git-svn-id: file:///svn/phpbb/trunk@8572 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-29 12:25:56 +00:00
Meik Sievertsen
8c64d7c32a merging #r8426 to #r8430
git-svn-id: file:///svn/phpbb/trunk@8431 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-03-13 15:25:20 +00:00
Meik Sievertsen
0c5839a0b9 merge revisions #r8392 and #r8393
git-svn-id: file:///svn/phpbb/trunk@8394 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-02-23 15:32:34 +00:00
Meik Sievertsen
1407460895 Merging revisions #r8346, #r8347 and #r8348
git-svn-id: file:///svn/phpbb/trunk@8349 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-29 15:57:56 +00:00
Meik Sievertsen
f0dea06097 Correctly check empty subjects/messages (Bug #17915)
Do not check usernames against word censor list. Disallowed usernames is already checked and word censor belong to posts. (Bug #17745)
Additionally include non-postable forums for moderators forums shown within the teams list. (Bug #17265)


git-svn-id: file:///svn/phpbb/trunk@8306 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-05 16:10:10 +00:00
David M
af738dbc2a Ch-ch-ch-changes
- Made us more DB independent by making many queries capability based instead of DB specific
- Finished PHP5ifying of the acm_file class, now with some (hopefully) enhancements to its performance
- Sped up viewforum considerably (also goes towards mcp_forum)

I really hope I didn't explode CVS...


git-svn-id: file:///svn/phpbb/trunk@8301 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-04 18:35:49 +00:00
Meik Sievertsen
f3fd02548a do not allow [size=0]
git-svn-id: file:///svn/phpbb/trunk@8256 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-11-29 14:09:32 +00:00
Meik Sievertsen
c698a2571a further updates
git-svn-id: file:///svn/phpbb/trunk@8248 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-11-19 16:44:30 +00:00
Meik Sievertsen
bc0898f55e fixing some annoying bugs
git-svn-id: file:///svn/phpbb/trunk@8204 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-19 13:10:13 +00:00
Meik Sievertsen
10ed58b2c9 prevent posting empty messages with some UTF8-characters as well as fixing conversion in CVS.
git-svn-id: file:///svn/phpbb/trunk@8163 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-11 08:12:41 +00:00
Meik Sievertsen
e8b2c4128e some tiny bugfixes
git-svn-id: file:///svn/phpbb/trunk@8155 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-08 14:38:44 +00:00
Meik Sievertsen
e6c79242e6 dumdidum... sorry. ;)
git-svn-id: file:///svn/phpbb/trunk@8146 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-05 14:30:11 +00:00
David M
eca02ecbf3 #i71
#i72


git-svn-id: file:///svn/phpbb/trunk@8128 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-04 04:42:39 +00:00
Meik Sievertsen
87e2e62c34 #i8
git-svn-id: file:///svn/phpbb/trunk@8119 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-02 18:29:05 +00:00
Nils Adermann
d104d3d969 - BBCode parsing order should ALWAYS be censor_text(), bbcode_secon_pass(), bbcode_nl2br(), smiley_text(), parse_attachments()
- using \r on custom bbcodes to allow line breaks [Bug #10758]


git-svn-id: file:///svn/phpbb/trunk@8050 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-19 13:40:53 +00:00
David M
c09bd8c69f #14132
git-svn-id: file:///svn/phpbb/trunk@8039 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-16 19:24:32 +00:00
Nils Adermann
487ca92299 - added information about Unicode to coding guidelines
- two little changes


git-svn-id: file:///svn/phpbb/trunk@8035 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-16 12:19:26 +00:00
Meik Sievertsen
2bbd2fb1f9 some bugs fixed
git-svn-id: file:///svn/phpbb/trunk@8033 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-15 17:32:48 +00:00
Henry Sudhof
fcb0c89962 Cleaning up (#13689)
Also removed the useless login box from the ACP.


git-svn-id: file:///svn/phpbb/trunk@7919 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-22 14:04:26 +00:00
Meik Sievertsen
f27fa04b8c even more fixes. :o
git-svn-id: file:///svn/phpbb/trunk@7889 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-15 13:47:01 +00:00
Meik Sievertsen
002dd81557 some more fixes
git-svn-id: file:///svn/phpbb/trunk@7875 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-12 16:14:07 +00:00
Meik Sievertsen
d7218c0b16 if used more than once, do not print out notices. ;)
git-svn-id: file:///svn/phpbb/trunk@7814 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-01 09:08:03 +00:00
Meik Sievertsen
f9ea21a083 fixing some bugs
git-svn-id: file:///svn/phpbb/trunk@7805 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-28 14:55:48 +00:00
Meik Sievertsen
13a02f6cc5 my round of bug fixes
git-svn-id: file:///svn/phpbb/trunk@7749 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-11 00:12:42 +00:00
David M
ef48211dc5 um, oops
git-svn-id: file:///svn/phpbb/trunk@7747 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-10 19:58:20 +00:00
David M
c4d442f8eb #11833
git-svn-id: file:///svn/phpbb/trunk@7746 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-10 19:50:53 +00:00
David M
eff4e04a4e #12189
git-svn-id: file:///svn/phpbb/trunk@7745 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-10 16:13:43 +00:00
David M
de739b6532 removed a looped regex
git-svn-id: file:///svn/phpbb/trunk@7743 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-10 13:39:04 +00:00
Meik Sievertsen
455536773f 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!)
git-svn-id: file:///svn/phpbb/trunk@7736 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-09 11:11:20 +00:00
Meik Sievertsen
498b87df10 do not strip our pre-parsed text if it is outside or between code blocks
git-svn-id: file:///svn/phpbb/trunk@7712 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-03 18:47:05 +00:00
Meik Sievertsen
e6f46e65a7 fix an improper fix.
- generally, sorry, but direct url parsing after ] will no longer work...
- try to eliminate the most common "bug" for placing urls within the [url=][/url] part (the text). This will trigger make_clickable and render the url invalid (doubled url), moreso if other text is involved too. This is still te case if the url is not written directly after the [url=] part. This is nearly the best we can get within 3.0.x - and every report about [url=], [url] and make_clickable and it's non-parsing or parsing will be closed with "will not fix", except it is a critical bug resulting in the non-functioning of the board. We may adjust this later to our own liking while we try to find different ways to face these problems.


git-svn-id: file:///svn/phpbb/trunk@7681 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-25 18:00:22 +00:00
Meik Sievertsen
d180ac3d02 #11429
git-svn-id: file:///svn/phpbb/trunk@7668 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-23 18:30:41 +00:00
Meik Sievertsen
4c44eddc90 we included a check for getimagesize() existance... now we again can suppress notices while running this function.
git-svn-id: file:///svn/phpbb/trunk@7646 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-19 16:40:56 +00:00
Meik Sievertsen
4dd4302ff8 errr, allow linkage to download.php....
git-svn-id: file:///svn/phpbb/trunk@7643 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-19 13:25:18 +00:00
Meik Sievertsen
eafe38ea7a ok... enough of this. Do not change [quote] layout at all. Smilies, urls, etc. won't parse now again directly after quotes - away with this. Actually we do not need to babysit users, but the feature was nice and fixed an inability which anoyed me in 2.0.x. Hey, you can't have everything - at least it is no longer error prone.
git-svn-id: file:///svn/phpbb/trunk@7634 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-18 17:04:34 +00:00
Meik Sievertsen
c0caf7652f Fixing some tiny bugs...
- correctly close span tags within code=php


git-svn-id: file:///svn/phpbb/trunk@7619 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-17 14:59:33 +00:00