makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-22 11:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
7806 commits 18 branches 192 tags 207 MiB
Commit graph

743 commits

Author SHA1 Message Date
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
Henry Sudhof
1739da9335 Merging R9051 and R 9052 
git-svn-id: file:///svn/phpbb/trunk@9062 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-11-13 11:46:49 +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
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
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
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
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
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
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
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
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
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
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
Meik Sievertsen
44416f4744 - queue trigger feature 
- queued posts do not affect user_posts
- show links to MCP + queued posts in ucp and acp


git-svn-id: file:///svn/phpbb/trunk@8816 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-04 14:04:30 +00:00
Chris Smith
0dbe7e3b6c Remove caching of templates from the database completely, themes is cut down ready for a complete chop, and fix the installer :) 
git-svn-id: file:///svn/phpbb/trunk@8812 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-04 11:39:25 +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
8174462e89 Merge chmod changes into trunk 
git-svn-id: file:///svn/phpbb/trunk@8781 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-08-22 13:32:34 +00:00
Meik Sievertsen
15e04808fc writeable -> writable merge 
git-svn-id: file:///svn/phpbb/trunk@8762 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-08-16 13:11:50 +00:00
Marek A. R
4235be4bcb PHP5.3 compatibility. 
git-svn-id: file:///svn/phpbb/trunk@8759 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-08-15 13:00:20 +00:00
Henry Sudhof
6eed0e5bd2 merge 
git-svn-id: file:///svn/phpbb/trunk@8744 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-08-13 12:28:17 +00:00
Henry Sudhof
c1cf3404a2 No negative values (#30335) 
git-svn-id: file:///svn/phpbb/trunk@8723 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-07-29 15:14:07 +00:00
Henry Sudhof
db4011c9d9 Merge style element name conflict code 
git-svn-id: file:///svn/phpbb/trunk@8712 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-07-29 14:35:32 +00:00
Meik Sievertsen
7c79d0f860 hmm, this seems to be a merge i forgot 
git-svn-id: file:///svn/phpbb/trunk@8711 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-07-29 13:39:50 +00:00
Meik Sievertsen
d8f2c4a1c4 add warning to ACP index if config file is writeable 
git-svn-id: file:///svn/phpbb/trunk@8689 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-07-28 13:21:53 +00:00
Marek A. R
3892e7330a Fix merge to use the new constants 
git-svn-id: file:///svn/phpbb/trunk@8660 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-06-19 17:51:11 +00:00
Meik Sievertsen
eeba8f4560 Fix some instances where we left db connections open (registration -> captcha for example) 
git-svn-id: file:///svn/phpbb/trunk@8656 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-06-13 19:44:40 +00:00
David M
97d2fb55b7 /me slaps himself for being old school 
git-svn-id: file:///svn/phpbb/trunk@8650 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-06-12 07:27:01 +00:00
David M
0ebc5cc9ee The beginnings of the destruction of phpBB's greatest bottleneck, dynamic css... 
As of phpBB 3.0.x, we take our "generic" CSS for a theme and later on combine it with the imagesets and languages as needed... What we did for 3.0.x involved dynamically resolving the variables in the CSS and then sending it off, caching it at several layers (except the one that mattered). The biggest issue with style.php is that it is one giant str_replace on every page load, no matter what; cache be damned. Instead, the trick is to cache the full compilation earlier on...
Further work to do: kill all the old crap and fully integrate the new solution


git-svn-id: file:///svn/phpbb/trunk@8649 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-06-12 07:24:13 +00:00
Henry Sudhof
d7a217c28c #16124 
git-svn-id: file:///svn/phpbb/trunk@8635 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-06-09 13:06:14 +00:00
Henry Sudhof
fe2343965b merge 
git-svn-id: file:///svn/phpbb/trunk@8629 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-06-09 11:59:43 +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
Henry Sudhof
ea3eb9e9c3 merge 
git-svn-id: file:///svn/phpbb/trunk@8608 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-06-05 11:38:33 +00:00
Nils Adermann
150c6c4c24 removed executable props [Bug #6464] 
git-svn-id: file:///svn/phpbb/trunk@8599 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-06-04 15:38:14 +00:00
Henry Sudhof
65fb840b76 merge 
git-svn-id: file:///svn/phpbb/trunk@8587 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-06-03 16:33:02 +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
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
Meik Sievertsen
eb664ddafb some missing merges... 
git-svn-id: file:///svn/phpbb/trunk@8545 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-05-04 14:47:49 +00:00
Henry Sudhof
ebb801ebff merge 
git-svn-id: file:///svn/phpbb/trunk@8534 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-05-02 14:44:41 +00:00
Meik Sievertsen
4b9077a58b merge 
git-svn-id: file:///svn/phpbb/trunk@8532 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-04-30 15:56:02 +00:00
Meik Sievertsen
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
Meik Sievertsen
dbae1db24c merge some changes/fixes 
henry: is your viewonline fix/change missing? ;)

git-svn-id: file:///svn/phpbb/trunk@8503 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-04-11 14:21:45 +00:00
David M
2deee69e2f Some neat stuff, the new DBAL function has the potential of removing somewhere in the ballpark of 40% of all the DBAL code. It combines a few very common idioms into one statement, allowing us to implicitly use prepared statements. Short term advantages are the ability to remove the gross code that attempts to work around DB2, Oracle and Firebird. Long term advantages include removing the burden of sanitizing data (at least on input) from our end and placing it on shoulders of the backend PHP driver. 
Also included is a new posting API I am working on. It is not a real API in so much as it is a backend that a "nice" API could use. User submitted functions are welcome :) It represents a massive simplification in post and topic accounting and a generalization of concepts like "soft deletion" as it works across both topics and posts (yes, this has preliminary support for soft deletions). The only "interesting" problem left is global topics, this has yet to be solved.

Enough talk, time for sleep.

P.S.
Sorry if I broke stuff, was not done on purpose :)

git-svn-id: file:///svn/phpbb/trunk@8485 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-04-02 08:28:21 +00:00
Henry Sudhof
7596a3bfdc #22385 - David told me to ci this 
git-svn-id: file:///svn/phpbb/trunk@8473 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-03-26 17:32:05 +00:00
Meik Sievertsen
312bd1a670 merging, revisions #r8453 and #r8454 
git-svn-id: file:///svn/phpbb/trunk@8455 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-03-21 10:50:11 +00:00
Meik Sievertsen
02a5032a52 merging... again 
git-svn-id: file:///svn/phpbb/trunk@8452 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-03-18 14:47:43 +00:00
Henry Sudhof
cf17b13c98 Problem migrating old cvs working copy to svn 
git-svn-id: file:///svn/phpbb/trunk@8423 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-02-29 13:42:28 +00:00
Henry Sudhof
2a3eb724a8 cross-ci 
git-svn-id: file:///svn/phpbb/trunk@8411 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-02-27 15:21:23 +00:00
Nils Adermann
30b24d476c guess we need to initialise it first 
git-svn-id: file:///svn/phpbb/trunk@8404 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-02-26 17:13:12 +00:00
Nils Adermann
f83b47bc11 allow search backends to handle regular updates too, and not just backend switches 
git-svn-id: file:///svn/phpbb/trunk@8403 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-02-25 18:39:16 +00:00