mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 12:34:59 +02:00
Code Issues Releases Wiki Activity
7,953 Commits 18 Branches 192 Tags
Commit Graph

546 Commits

Author SHA1 Message Date
Meik Sievertsen
b68de2323d merge changes from 3.0.x branch 
git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-16 15:48:23 +00:00
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
d181f0ef36 append_sid wrapper + is_guest 
git-svn-id: file:///svn/phpbb/trunk@9338 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-02-22 19:17:10 +00:00
Meik Sievertsen
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
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
Meik Sievertsen
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
Meik Sievertsen
81b57da147 force full date on "edited by" line. ;) 
git-svn-id: file:///svn/phpbb/trunk@9139 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-11-30 16:56:31 +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
Meik Sievertsen
04f7c1da69 Only display special ranks to guests; no longer display normal ranks for guests (Bug #36735) 
[changed parameters for get_user_rank(), breaks backward compatibility]

git-svn-id: file:///svn/phpbb/trunk@9083 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-11-22 20:26:47 +00:00
Meik Sievertsen
d46e8e6f98 merge revisions i missed... hopefully not breaking things - did not check every change. 
git-svn-id: file:///svn/phpbb/trunk@9077 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-11-22 19:38:25 +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
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
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
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
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
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
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
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
Henry Sudhof
3a3b9eb8ef merge 
git-svn-id: file:///svn/phpbb/trunk@8776 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-08-21 15:50:21 +00:00
Henry Sudhof
8236a7438d merge 
git-svn-id: file:///svn/phpbb/trunk@8753 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-08-13 14:43:14 +00:00
Meik Sievertsen
1b67e80422 marge 
git-svn-id: file:///svn/phpbb/trunk@8696 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-07-28 13:37:16 +00:00
Meik Sievertsen
8822747b91 merge... 
git-svn-id: file:///svn/phpbb/trunk@8610 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-06-05 14:11:42 +00:00
Nils Adermann
a11f41986f corrected link for searching post author's other posts [Bug #26455] 
git-svn-id: file:///svn/phpbb/trunk@8600 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-06-04 15:48:00 +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
Henry Sudhof
60aad364c8 #26605 
git-svn-id: file:///svn/phpbb/trunk@8537 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-05-02 16:39:30 +00:00
Meik Sievertsen
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
Meik Sievertsen
5dddcb42ae - Do not split topic list for topics being promoted to announcements after been moved to another forum (Bug #18635) 
- Allow editing usernames within database_update on username cleanup (Bug #18415)
- Fixing wrong sync() calls if moving all posts by a member in ACP (Bug #18385)
- Check entered imagemagick path for trailing slash (Bug #18205)
- Use proper title on index for new/unread posts (Bug #13101) - patch provided by Pyramide
- Allow calls to $user->set_cookie() define no cookie time for setting session cookies (Bug #18025)


git-svn-id: file:///svn/phpbb/trunk@8310 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-01-06 17:00:09 +00:00
David M
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
Henry Sudhof
5abe1ea4fe #15039 
git-svn-id: file:///svn/phpbb/trunk@8228 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-11-06 00:05:53 +00:00
Henry Sudhof
04ebbeca3f '1' might not have been a good choice 
git-svn-id: file:///svn/phpbb/trunk@8216 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-29 13:39:34 +00:00
Meik Sievertsen
1a1a925e8f erm, switches could be more useful if not within a loop. ;) and :P 
git-svn-id: file:///svn/phpbb/trunk@8205 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-19 13:34:31 +00:00
Nils Adermann
d095649a65 - Display "Return to" links on unwritable forums [Bug #14824] 
git-svn-id: file:///svn/phpbb/trunk@8200 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-17 15:01:56 +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
Meik Sievertsen
951f793dae some fixes. :P 
- language authors may review their email template files...


git-svn-id: file:///svn/phpbb/trunk@8092 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-09-18 14:49:19 +00:00
Meik Sievertsen
cda8083ba7 fixing some bugs 
git-svn-id: file:///svn/phpbb/trunk@8075 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-09-02 17:24:56 +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
Nils Adermann
d25ca29ca0 - strip_bbcode should not treat smilies which look like BBCode and are placed in front of a closing tag as BBCode 
- highlight in post subjects and topic titles
- language entry SMILIE_ONE_ADDED should have been SMILIES_ONE_ADDED


git-svn-id: file:///svn/phpbb/trunk@8045 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-08-17 23:53:06 +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
David M
11f05e3513 kill the debug code 
git-svn-id: file:///svn/phpbb/trunk@8024 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-08-13 05:39:57 +00:00
David M
ea636f16ee remove the need for filesorting 
git-svn-id: file:///svn/phpbb/trunk@8023 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-08-13 05:20:20 +00:00
Meik Sievertsen
251f42c1cd ok, remove this bugfix, it is giving more problems and is actually only relevant for splitting topics. :) We will see if we are able to incorporate it... 
git-svn-id: file:///svn/phpbb/trunk@7974 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-28 16:40:59 +00:00
Meik Sievertsen
a43ead8ee7 do not get too excited 
git-svn-id: file:///svn/phpbb/trunk@7954 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-26 15:51:11 +00:00
Meik Sievertsen
f813c7ad0d two fixes 
git-svn-id: file:///svn/phpbb/trunk@7940 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-24 16:16:39 +00:00