51d173ff1e
(a little test for later merges)
...
reintegrate branch into trunk (r10214)
git-svn-id: file:///svn/phpbb/trunk@10215 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-06 13:40:01 +00:00
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
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
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
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
b27add94f8
$template to phpbb::$template
...
git-svn-id: file:///svn/phpbb/trunk@9337 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-22 18:56:09 +00:00
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
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
57aea7e62f
modified some files to get the admin index page working, as well as index page in logged in state and not logged in state
...
additionally prepare for a working installation
git-svn-id: file:///svn/phpbb/trunk@9272 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-01-16 17:41:04 +00:00
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
889fa87140
implement new phpbb::$acm object, replacing $cache global
...
git-svn-id: file:///svn/phpbb/trunk@9240 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-28 13:27:58 +00:00
25725c9850
replace constants with class constants.
...
ACL_YES, ACL_NO, ACL_NEVER, USER_NORMAL, USER_IGNORE, USER_INACTIVE, USER_FOUNDER
git-svn-id: file:///svn/phpbb/trunk@9233 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-27 12:18:04 +00:00
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
3cd007c49d
change cache:: to phpbb_cache::
...
git-svn-id: file:///svn/phpbb/trunk@9226 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-24 14:44:19 +00:00
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
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
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
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
48701289ff
Igor, hope that makes you happy
...
git-svn-id: file:///svn/phpbb/trunk@8729 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-29 15:38:30 +00:00
dceaf59d3b
Merge avatar deletion on change code
...
git-svn-id: file:///svn/phpbb/trunk@8713 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-29 14:38:46 +00:00
ad739a358c
merge? merge.
...
git-svn-id: file:///svn/phpbb/trunk@8672 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-23 18:22:44 +00:00
d7a217c28c
#16124
...
git-svn-id: file:///svn/phpbb/trunk@8635 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-09 13:06:14 +00:00
d0140a096c
merge
...
git-svn-id: file:///svn/phpbb/trunk@8627 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-09 11:36:17 +00:00
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
91b4fe1868
Merging mime and referer checks into the Trunk
...
git-svn-id: file:///svn/phpbb/trunk@8571 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-28 13:05:45 +00:00
53dc95d429
#26885
...
git-svn-id: file:///svn/phpbb/trunk@8564 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-18 20:02:14 +00:00
91d0c8b3bf
merge again, revisions 8516 to 8525
...
git-svn-id: file:///svn/phpbb/trunk@8526 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-04-21 15:10:59 +00:00
95f11a38c0
Cross ci, converter not updated. (as 3.1 schema won't fit any more)
...
git-svn-id: file:///svn/phpbb/trunk@8383 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-02-14 12:38:06 +00:00
4b5fab372f
merge with revision #r8350
...
git-svn-id: file:///svn/phpbb/trunk@8351 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-30 16:14:39 +00:00
370e189f15
- make viewforum work again
...
- remove the lower case functions, they were stupid anyway
- added some indexes
- added a group_name_clean column
git-svn-id: file:///svn/phpbb/trunk@8315 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-08 06:44:05 +00:00
2f08a36062
- add DB2 support
...
/me takes a nap
git-svn-id: file:///svn/phpbb/trunk@8308 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-06 13:46:20 +00:00
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
85055ac97f
oh boy...
...
- Migrate code base to PHP 5.1+
git-svn-id: file:///svn/phpbb/trunk@8295 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-03 17:00:40 +00:00
3ca0a7cb76
What did you expect? Us slacking off because of a few digg/heise trolls? nah. never!
...
The show must go on :)
git-svn-id: file:///svn/phpbb/trunk@8280 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-12-13 22:23:25 +00:00
808385967c
Small things
...
#15068
#15060
git-svn-id: file:///svn/phpbb/trunk@8233 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-11-10 18:50:36 +00:00
19d3483c38
make sure we always check for a valid directory handle
...
git-svn-id: file:///svn/phpbb/trunk@8211 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-21 11:26:24 +00:00
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
8963b032de
#14834 - at least probably
...
git-svn-id: file:///svn/phpbb/trunk@8203 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-18 18:25:06 +00:00
6e530cb851
make the ban check perform a bit better :/
...
git-svn-id: file:///svn/phpbb/trunk@8202 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-18 17:44:02 +00:00
e6c79242e6
dumdidum... sorry. ;)
...
git-svn-id: file:///svn/phpbb/trunk@8146 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-05 14:30:11 +00:00
70c531c686
and one more.
...
git-svn-id: file:///svn/phpbb/trunk@8121 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-03 15:09:44 +00:00
7be10f7bf5
#i51 - #i63 - #i64
...
git-svn-id: file:///svn/phpbb/trunk@8095 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-09-21 15:05:04 +00:00
36e99af959
#14466
...
git-svn-id: file:///svn/phpbb/trunk@8091 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-09-15 13:27:06 +00:00
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
dca78b88a0
Better this way.
...
git-svn-id: file:///svn/phpbb/trunk@8010 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-06 11:25:59 +00:00
7693609d0c
hrm
...
git-svn-id: file:///svn/phpbb/trunk@8008 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-05 16:14:23 +00:00
65abb76a8c
Okay, this add a few queries, but now ranks and avatars should behave as expected.
...
git-svn-id: file:///svn/phpbb/trunk@8007 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-05 15:57:06 +00:00
5d5df25f75
#13961 - the fix is not perfect, we now nuke the avatar/rank when leaving a group - no matter what.
...
git-svn-id: file:///svn/phpbb/trunk@8005 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-04 13:53:19 +00:00
5ed0be15ab
some tiny fixes and two new features. ;)
...
git-svn-id: file:///svn/phpbb/trunk@7994 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-01 16:27:06 +00:00
cef5720962
#13906 Invalid files will be silently ignored
...
git-svn-id: file:///svn/phpbb/trunk@7989 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-31 16:31:30 +00:00
