Commit graph

3195 commits

Author SHA1 Message Date
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
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
Marek A. R
677e6451c4 ...
git-svn-id: file:///svn/phpbb/trunk@8654 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-13 18:12:52 +00:00
Marek A. R
c44d2edc4a Changed the template compiler to work on streams. Should be a bit faster.
git-svn-id: file:///svn/phpbb/trunk@8653 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-13 17:57:47 +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
Meik Sievertsen
fc8db76da9 added two comments to describe the functions use-case
git-svn-id: file:///svn/phpbb/trunk@8644 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-10 12:55:32 +00:00
Nils Adermann
d168abdcc9 Regular expression for email matching in posts will no longer die on long words
git-svn-id: file:///svn/phpbb/trunk@8642 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-09 22:32:51 +00:00
Meik Sievertsen
50f5502cc9 check if folder is not empty (may happen for absolute paths). Thanks paul
git-svn-id: file:///svn/phpbb/trunk@8640 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-09 17:46:41 +00:00
Meik Sievertsen
e199f55ba2 #27395
git-svn-id: file:///svn/phpbb/trunk@8637 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-09 17:10:59 +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
8f3c085f7f #27325
git-svn-id: file:///svn/phpbb/trunk@8633 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-09 12:37:44 +00:00
Henry Sudhof
4ba2921cec #23945
git-svn-id: file:///svn/phpbb/trunk@8632 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-09 12:37:08 +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
Henry Sudhof
d0140a096c merge
git-svn-id: file:///svn/phpbb/trunk@8627 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-09 11:36:17 +00:00
Meik Sievertsen
1aa40171e0 merge...
git-svn-id: file:///svn/phpbb/trunk@8624 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-08 21:44:59 +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
Henry Sudhof
4dddc3a130 Some xenophobia
git-svn-id: file:///svn/phpbb/trunk@8612 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-06 11:28:55 +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
443ec9dcb0 merging r8604 into trunk
git-svn-id: file:///svn/phpbb/trunk@8606 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-04 17:28:43 +00:00
Nils Adermann
e08a400b9f HTTP Authentication supports UTF-8 usernames now [Bug #21135]
git-svn-id: file:///svn/phpbb/trunk@8603 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-04 16:05:49 +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
Meik Sievertsen
e8b7c45d85 fix adm redirect
git-svn-id: file:///svn/phpbb/trunk@8590 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-06-04 11:23:00 +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
Henry Sudhof
98dadd5eb8 merge
git-svn-id: file:///svn/phpbb/trunk@8575 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-29 14:07:55 +00:00
Meik Sievertsen
8ce9e1b852 i am very sorry... i played a bit... :(
git-svn-id: file:///svn/phpbb/trunk@8573 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-29 12:28:07 +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
28e8c3ea85 merge
git-svn-id: file:///svn/phpbb/trunk@8570 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-05-26 12:05:22 +00:00