1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 10:09:15 +02:00

3374 Commits

Author SHA1 Message Date
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
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
Meik Sievertsen
c83e6f7e94 cleanage
git-svn-id: file:///svn/phpbb/trunk@8822 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-04 14:10:17 +00:00
Meik Sievertsen
3a330753f4 Get real dbms version instead of relying on php internal functions which only grab the local library version
git-svn-id: file:///svn/phpbb/trunk@8821 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-04 14:10:03 +00:00
Meik Sievertsen
a736c97c04 needed for mysql 4.1.3+?
git-svn-id: file:///svn/phpbb/trunk@8820 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-04 14:08:19 +00:00
Meik Sievertsen
199ab53f30 support new method of getting correct language strings for nullar/singular/plural forms
git-svn-id: file:///svn/phpbb/trunk@8819 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-04 14:07:30 +00:00
Meik Sievertsen
63e2f5cf14 add phpbb version number to constants
git-svn-id: file:///svn/phpbb/trunk@8818 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-04 14:06:43 +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
Chris Smith
f2abefeaed Merge in r8758, r8807, r8808, r8809
git-svn-id: file:///svn/phpbb/trunk@8810 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-02 13:36:48 +00:00
Henry Sudhof
57ec5805df Merging R8795
git-svn-id: file:///svn/phpbb/trunk@8796 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-29 11:53:11 +00:00
Henry Sudhof
323fb23b49 Merge R8790/8791
git-svn-id: file:///svn/phpbb/trunk@8793 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-28 13:12:18 +00:00
Meik Sievertsen
cbacffd9fc fix bug #32925
git-svn-id: file:///svn/phpbb/trunk@8789 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-25 17:17: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
Henry Sudhof
a45ac24bd7 comments
git-svn-id: file:///svn/phpbb/trunk@8779 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-22 11:02:17 +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
Meik Sievertsen
76a542a03e merge
git-svn-id: file:///svn/phpbb/trunk@8773 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-21 14:21:38 +00:00
Marek A. R
c119d0b424 More 5.3 compatibility.
git-svn-id: file:///svn/phpbb/trunk@8767 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-16 22:32:24 +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
f741c4ff05 merge
git-svn-id: file:///svn/phpbb/trunk@8757 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-14 12:49:11 +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
Henry Sudhof
ae27aaf1a4 merge
git-svn-id: file:///svn/phpbb/trunk@8750 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-13 14:22:27 +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
David M
6a401ab68b Extracted the IF code to make a generic parsing function,
now DEFINE is nicely integrated and we can even do things
like <!-- BEGIN foo($FOO, $BAR) --> if we *really* wanted
to do so.


git-svn-id: file:///svn/phpbb/trunk@8742 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-03 18:11:40 +00:00
Marek A. R
b3e2250391 Compile things like {$FOO} again.
git-svn-id: file:///svn/phpbb/trunk@8741 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-01 15:13:23 +00:00
Meik Sievertsen
c002c468c4 change conditional enclosements in template engine
oh... thank you very much brainy. :)

git-svn-id: file:///svn/phpbb/trunk@8740 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-01 14:36:52 +00:00
Meik Sievertsen
1071d9cb31 merge cookie secure detection
git-svn-id: file:///svn/phpbb/trunk@8738 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-01 14:30:42 +00:00
Henry Sudhof
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
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
be1849a901 Merge make the MCP remember a bit more - still far from perfect as pagination makes it forget
git-svn-id: file:///svn/phpbb/trunk@8716 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-29 14:57:54 +00:00
Henry Sudhof
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
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
Marek A. R
8c186d97c6 - Make "<?" and/or "<%" in template files not break the compiled template.
- Enable <!-- PHP --> and <!-- INCLUDEPHP --> again.

git-svn-id: file:///svn/phpbb/trunk@8699 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-28 15:01:06 +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
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
David M
41d3effa19 Added the locking code back in... Marek, feel free to reorder it as you see fit.
git-svn-id: file:///svn/phpbb/trunk@8687 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-28 01:16:47 +00:00
Marek A. R
0c4ae1cd97 - Optimise compiled template code.
- Improve template filter.

git-svn-id: file:///svn/phpbb/trunk@8685 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-27 22:08:47 +00:00
Meik Sievertsen
036dc071e7 merge
git-svn-id: file:///svn/phpbb/trunk@8684 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-27 13:42:46 +00:00
Marek A. R
d5d7de4ffa - Add some necessary evil
- Template DEFINE variables can now be assigned other variables

git-svn-id: file:///svn/phpbb/trunk@8683 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-25 17:24:12 +00:00
Marek A. R
e0799b79e2 Fix file ACM to work with cached single-quotes and other characters that could need escaping.
git-svn-id: file:///svn/phpbb/trunk@8681 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-13 19:08:30 +00:00
Marek A. R
95462dca58 git-svn-id: file:///svn/phpbb/trunk@8680 89ea8834-ac86-4346-8a33-228a782c2dd0 2008-07-12 18:22:47 +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
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