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

91 Commits

Author SHA1 Message Date
Andreas Fischer
513b95642e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10147] Corrected a typo in includes/functions_template.php.
2011-04-23 21:52:04 +02:00
Oleg Pudeyev
a8ecd30fe1 [ticket/10147] Corrected a typo in includes/functions_template.php.
PHPBB3-10147
2011-04-23 15:36:45 -04:00
Meik Sievertsen
fd24241044 Revert INC/DEC feature. It is not consistent with the other template variables - bad idea. ;) We will get to it though... but not now.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10064 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-30 11:15:24 +00:00
Meik Sievertsen
b47b35a07d This is an enhancement for revision r10051 (INC template variable)
Within the mentioned revision INC was only able to be applied to defined template variables.
I extended it now to work on all supported variables (template vars, defines, loops, defines in loops)
I also added a DEC template variable to logically complete this.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10054 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-25 09:48:44 +00:00
Henry Sudhof
03568fd176 Add INC (working name) to template syntax
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10051 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-24 15:12:40 +00:00
Meik Sievertsen
b613781d3a Preserve newlines in template files (one newline had been always dropped after a template variable due to PHP's handling of closing tags)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9811 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-21 10:58:31 +00:00
Joas Schilling
7d605da65b Fix bug #45805 - INCLUDEPHP not depending on phpbb_root_path
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9633 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-19 22:07:27 +00:00
Chris Smith
76cffeff0a Dynamic template includes :)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9570 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-11 16:53:45 +00:00
Chris Smith
193396e9d0 Enforce correct case for template variables. {var} no longer works for example.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9419 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-31 12:21:36 +00:00
Chris Smith
228e693559 Fix r9363, DEFINE uses template_compile::compile() which was generating really broken PHP :)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9368 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-14 02:08:04 +00:00
Meik Sievertsen
d9468c35da add IN_PHPBB check to generated cache files
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9363 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-03-11 12:53:54 +00:00
Chris Smith
a94ed97992 Missing read permission from calls to phpbb_chmod()
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9208 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-19 20:36:18 +00:00
Marek A. R
4a225280a0 Don't compile {} or {$}.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8813 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-04 11:52:01 +00:00
Meik Sievertsen
6c763cd8b6 change the way we do chmodd'ing. I know, my implementation really sucked... good we have motivated community members who point this out. ;) Thanks to faw for providing a way better function and for discussing and also abiding to our needs. :) LEW21 should maybe credited too... he gave the inspiration without knowing it.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8780 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-22 12:52:48 +00:00
Meik Sievertsen
068096531f the chmod change i already had within the changelog (by mistake). This should further secure writable directories and created files.
Installation need to be tested on different hosts.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8763 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-16 19:06:18 +00:00
Meik Sievertsen
da65cd1397 only some space/tab changes as well as removing my debug code from the template file. ;)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8761 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-16 13:03:00 +00:00
Meik Sievertsen
00fa69cab9 change conditional enclosements in template engine
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8739 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-08-01 14:35:11 +00:00
Henry Sudhof
eda1d40861 Okay. Frozen, we never said anything about it being permafrost. Also, this is not 100% tested, expect troubel with store_db (I'm waiting for the bug reports)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8697 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-07-28 14:24:37 +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
David M
2cd7f67ed5 - more accurate comment
git-svn-id: file:///svn/phpbb/trunk@8137 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-04 16:56:35 +00:00
Meik Sievertsen
8257d1c828 ok, the nasty one then... :/
git-svn-id: file:///svn/phpbb/trunk@8044 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-17 21:29:20 +00:00
Meik Sievertsen
6b75e8ffcb ok, we are not able to cover all possibilities (IF A eq (B & C)) for example... or IF A == B... this would require a lot more code we do not see the need for.
git-svn-id: file:///svn/phpbb/trunk@8043 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-17 21:10:21 +00:00
Meik Sievertsen
b29d76b558 test adding isset() calls to if expressions. :o
git-svn-id: file:///svn/phpbb/trunk@8042 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-17 20:47:50 +00:00
Meik Sievertsen
5634fad4ae some fixes...
git-svn-id: file:///svn/phpbb/trunk@7813 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-30 15:04:49 +00:00
Meik Sievertsen
6d6c6179a8 allow constructs like <!-- ELSE -->0<!-- ENDIF --> (the 0 was replaced by '' due to the empty() checks on $trim_text_check)
git-svn-id: file:///svn/phpbb/trunk@7377 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-20 09:09:20 +00:00
Meik Sievertsen
ba536c6270 some fixes
git-svn-id: file:///svn/phpbb/trunk@7286 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-06 14:03:20 +00:00
David M
14e209a487 - generate fewer opcodes, make a smaller cache, a bit more readable
git-svn-id: file:///svn/phpbb/trunk@6935 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-27 13:36:50 +00:00
Meik Sievertsen
ddddda47fb - fix some oddities (doubled spaces for example)
- changed the way make_forum_select() is returning the forum list - now including skipped forums but being disabled. This should make identifying the correct forum much more easier.
- Changed some permission namings based on suggestions by the community
- Tried to comply to the permission field ordering within the language files while displaying permission sets. Hopefully it's worth the additional processing time.
- Disable submit buttons after clicking for installation and conversions.


git-svn-id: file:///svn/phpbb/trunk@6930 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-26 16:09:51 +00:00
Meik Sievertsen
576bb754e9 fixing some bugs, most being submitted grammatical/spelling errors.
git-svn-id: file:///svn/phpbb/trunk@6915 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-21 18:33:45 +00:00
Meik Sievertsen
31e546c5e4 - fixing some bugs
- removing utf8 characters from email files (has been discussed internally, you guys know why)
- making sure some opendir calls are checked before calling readdir.


git-svn-id: file:///svn/phpbb/trunk@6912 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-20 17:58:27 +00:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01: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
ac37f87105 relocate some files
git-svn-id: file:///svn/phpbb/trunk@9225 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-24 14:15:41 +00:00
Chris Smith
9ef743ba7d fix tiny typos in r9087
git-svn-id: file:///svn/phpbb/trunk@9158 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-02 20:04:27 +00:00
Chris Smith
45ac6aba10 merge in r9145
git-svn-id: file:///svn/phpbb/trunk@9147 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-01 17:28:32 +00:00
Chris Smith
be17000b92 Clear the stat cache of cache files after writing them
git-svn-id: file:///svn/phpbb/trunk@9143 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-12-01 16:56:57 +00:00
Chris Smith
c95f0c7935 - Add template variable S_BLOCK_NAME
- Modify template::alter_block_array() so it supports modification of nested blocks
- Add (incomplete) tests for template::alter_block_array()


git-svn-id: file:///svn/phpbb/trunk@9116 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-25 00:31:32 +00:00
Chris Smith
332521a369 - Make a start on completing the phpDoc comments for the template engine
- Tidy template engine code, mainly PHP5 stuff, made some methods void instead of just returning true
- Add tests for the remaining untested compilation code


git-svn-id: file:///svn/phpbb/trunk@9115 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-24 21:59:33 +00:00
Chris Smith
528bd80651 Fix a bug we inherited from Smarty a long time ago
git-svn-id: file:///svn/phpbb/trunk@9109 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-24 11:38:22 +00:00
Chris Smith
3f11fc12ac S_NUM_ROWS gives you the number of rows in a block
git-svn-id: file:///svn/phpbb/trunk@9098 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-23 16:07:36 +00:00
Chris Smith
aa3a2f565b Why did I not do it this way to begin with :)
git-svn-id: file:///svn/phpbb/trunk@9097 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-23 16:01:33 +00:00
Chris Smith
416270ee77 - Deprecate S_ROW_COUNT use S_ROW_NUM
- S_ROW_NUM, S_FIRST_ROW, S_LAST_ROW are now using internal template engine variables saving memory
- Other small changes
- Update of template tests


git-svn-id: file:///svn/phpbb/trunk@9087 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-22 23:53:40 +00:00
Chris Smith
baf8d571e3 Mini bug fix for UNDEFINE
git-svn-id: file:///svn/phpbb/trunk@9016 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-15 01:47:37 +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
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
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
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