1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

136 Commits

Author SHA1 Message Date
Vjacheslav Trushkin
17989c17a0 [feature/merging-style-components] Moving template initialization out of style
Moving template initialization out of style constructor

PHPBB3-10632
2012-03-31 18:10:00 +03:00
Vjacheslav Trushkin
360312f599 [feature/merging-style-components] Initializing locator and provider separately
Moving locator and path provider initialization out of style class

PHPBB3-10632
2012-03-31 17:38:30 +03:00
Vjacheslav Trushkin
fd96f97dc3 [feature/merging-style-components] Updating style initialization
Changing template initialization to style initialization.

PHPBB3-10632
2012-03-15 21:11:34 +02:00
Vjacheslav Trushkin
3997ffac2a [feature/merging-style-components] Creating style class
Creating phpbb_style class, changing template initialization to style initialization

PHPBB3-10632
2012-03-15 13:13:21 +02:00
Vjacheslav Trushkin
b7d84a586c [feature/merging-style-components] Renaming template classes
Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates)

PHPBB3-10632
2012-03-14 23:12:11 +02:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Nils Adermann
520a5f9295 [feature/extension-manager] Refactoring the structure of extension provider
PHPBB3-10323
2011-09-29 16:15:53 +02:00
Nils Adermann
ea46feb115 [feature/extension-manager] Add support for templates in extensions.
This commit adds a template path provider to separate the process of locating
(cached) paths in extensions from the template engine. The locator is supplied
with a list of paths from the path provider.

Admin templates can now be created in ext/<ext>/adm/style/ and regular
templates go into ext/<ext>/styles/<style>/template/. Extension templates
override regular templates. So if an extension supplies a file with a name
used in phpBB, the extension's file will be used.

A side-effect of this commit: Locator and Provider are now able to deal with
arbitrary levels of template inheritance. So we can expose this through
phpbb_template if we choose to, and allow styles to inherit from inherited
styles.

PHPBB3-10323
2011-09-29 16:15:53 +02:00
Nils Adermann
6fa83ba876 Merge remote-tracking branch 'github-p/feature/template-engine' into develop
* github-p/feature/template-engine: (87 commits)
  [feature/template-engine] Delete _get_locator function.
  [feature/template-engine] Clean up template locator usage in bbcode.
  [feature/template-engine] Need to call set_template on template.
  [feature/template-engine] Update installer for template engine changes.
  [feature/template-engine] Dependency inject locator into template.
  [feature/template-engine] Delete useless code from set_template.
  [feature/template-engine] Delete no longer used $template_filename property.
  [feature/template-engine] Delete useless $template globalization.
  [feature/template-engine] Use template engine class in bbcode class.
  [feature/template-engine] Corrected an error message in template locator.
  [feature/template-engine] Remaining documentation.
  [feature/template-engine] More documentation for template class.
  [feature/template-engine] Create load_and_render to reduce code duplication.
  [feature/template-engine] Get rid of orig_tpl_* in template engine.
  [feature/template-engine] Delete $style_name param from locator's set_custom_template.
  [feature/template-engine] Add constructor to template locator.
  [feature/template-engine] Factor template locator out of template class.
  [feature/template-engine] Delete $files_template property.
  [feature/template-engine] Rename is_absolute to phpbb_is_absolute.
  [feature/template-engine] Test template DEFINE statements across files
  ...

Conflicts:
	.gitignore
	phpBB/includes/template.php
2011-08-13 23:59:15 -04:00
Oleg Pudeyev
7cfd4052c5 [feature/template-engine] Clean up template locator usage in bbcode.
PHPBB3-9726
2011-08-13 23:49:54 -04:00
Oleg Pudeyev
acb767f14d [feature/template-engine] Dependency inject locator into template.
PHPBB3-9726
2011-08-09 23:28:40 -04:00
Oleg Pudeyev
4bb56cddb3 [feature/template-engine] Delete no longer used $template_filename property.
PHPBB3-9726
2011-08-09 23:18:58 -04:00
Oleg Pudeyev
035a8d7154 [feature/template-engine] Delete useless $template globalization.
PHPBB3-9726
2011-08-09 23:18:37 -04:00
Oleg Pudeyev
df46a576e9 [feature/template-engine] Use template engine class in bbcode class.
PHPBB3-9726
2011-08-07 19:26:28 -04:00
Oleg Pudeyev
e81c7a788a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8937] Keep space characters in front of [code] bbcode content
2011-08-07 16:30:32 -04:00
Nils Adermann
627e2644a2 [ticket/8937] Keep space characters in front of [code] bbcode content
PHPBB3-8937
2011-07-17 00:44:39 -04:00
Henry Sudhof
22621e0439 Enter stage left: the INTTEXT token
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10516 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-21 11:33:29 +00:00
Nils Adermann
6b99b85c8f BBCode parser now uses the user object for all settings rather than taking some from the template object [Bug #57365]
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10515 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-21 01:31:10 +00:00
Joas Schilling
697fd5a134 Fix #51285 and more issues with template inherence on set_custom_template
Conflict introduced with r9839 and r9823

Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10150 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-16 08:11:52 +00:00
Meik Sievertsen
bd516916b8 Color bbcode now supports three-digit hex notation. (Bug #39965 - Patch by leviatan21)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9722 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-07 11:41:07 +00:00
Meik Sievertsen
a7be268aa6 change arabic-numbers list-style-type to correct type decimal (Bug #30775)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9461 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-17 15:23:17 +00:00
Meik Sievertsen
0a98003d91 revert r8893 - there were massive problems with the display and select all code
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8953 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-28 17:08:09 +00:00
Meik Sievertsen
20b08e2961 support tabs in code selections (Bug #25445). Still does not solve the strange "4 spaces prefixed on every line" problem in firefox. :/
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8893 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-19 16:40:24 +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
Nils Adermann
ff509e3a03 - Match custom BBCodes in the same way during first and second pass - patch provided by IBBoard [Bug #14268]
git-svn-id: file:///svn/phpbb/trunk@8153 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-07 10:34:45 +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
Nils Adermann
23e3766497 - Prevent {URL} token in custom BBCodes from make_clickable messing [Bug #14151]
- Added alternative tokens to custom BBCodes which are safe for CSS/Javascript and changed TEXT token to entitise opening and closing parantheses.


git-svn-id: file:///svn/phpbb/trunk@8056 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-08-19 21:29:31 +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
Dominik Dröscher
d165af785d #8576
Introducing percentage based font sizing for the font-site BBCode


git-svn-id: file:///svn/phpbb/trunk@7157 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-03-09 19:01:40 +00:00
David M
70203a7123 #8456
git-svn-id: file:///svn/phpbb/trunk@7147 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-03-08 01:00:51 +00:00
David M
cfd02dedee blah, no need to capture this
git-svn-id: file:///svn/phpbb/trunk@7110 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-03-02 21:00:36 +00:00
David M
1e578bf79a #8374
git-svn-id: file:///svn/phpbb/trunk@7107 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-03-02 19:24:18 +00:00
Meik Sievertsen
2b35b9d60d - some bugfixes
- bugfixes for the convertor (typecasting for example was totally broken)


git-svn-id: file:///svn/phpbb/trunk@6865 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-01-09 14:10:44 +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
David M
e84d85d88c - Changed handling of the bitfield in bbcode.php
- #6270, reverted to an earlier version of list handling + bug fixes


git-svn-id: file:///svn/phpbb/trunk@6777 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-12-17 17:59:08 +00:00
Meik Sievertsen
d529f78adb rather large update, most important things done:
- implemented provided patch/diff file for bug #5350 (Highway of Life) with some tiny changes and alterations
- more username/colour changes/fixes
- added a note about PM rule-dependant message removals so the user is not wondering too much if he can't remember his rules. :)
- some column changes to fix unicode issues
- bugfixes


git-svn-id: file:///svn/phpbb/trunk@6650 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-11-24 14:59:26 +00:00
Meik Sievertsen
485935e1f1 he braces style is deprecated as of PHP 6
git-svn-id: file:///svn/phpbb/trunk@6459 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-10-07 17:40:07 +00:00
Meik Sievertsen
70dffaacbd fix custom bbcode html replacement to correctly replace references
It failed if there was a number directly after the token, resulting in $12345, where $1 was needed. Fixed by using ${x}

also made sure that newlines within the html replacement are not replaced with <br />.


git-svn-id: file:///svn/phpbb/trunk@6391 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-09-23 11:37:05 +00:00
Meik Sievertsen
8405f0d324 sql_in_set changes
git-svn-id: file:///svn/phpbb/trunk@6271 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-08-12 13:14:39 +00:00
David M
86f3d738a0 so.... what does this thing do?
well, the super fast, ultra efficient, massively huge BBCode handling system was implemented differently on each DBMS. Although this provided the best performance, the solution was a bit hacky.

So what does this new thing do? We use base64 encoding to make everything nice and shiny, it turns into nice, safe characters that we can just jam into varchars on essentially any database. This has two implications: we must decode every bitfield we get AND we have slightly fewer IDs to work with. It goes down from 2040 BBCodes to 1512. We lose like a quarter of them :P

P.S. I hope nothing broke :P


git-svn-id: file:///svn/phpbb/trunk@6263 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-08-11 21:52:46 +00:00
David M
9532514c2a OK...
This commit should increase the total number of BBCodes from 31 to 2040. Some things to watch out for:

Each database likes to deal with binary data in its own, special way. They are, quite frankly, too cool for school.

MySQL, MSSQL and Oracle all allow me to send in a default value for their binary column using a hex number. However, MSSQL forces me to send the specific data as a hex number and thus we must CAST it.

PostgreSQL allows me to set a binary column, but with a twist. It demands that the default be in _octal_ and its datatype allows somewhere around a gigabyte's worth of BBCodes ( PGSQL users, we shut you down to 2040 for your own good! )

Firebird has no decent mechanism for allowing me to shuttle in binary data so I must force my way in. By virtue of triggers and a UDF, we ram in our default values.

SQLite is the most bizarre of them all. They have no mechanism for turning an ASCII code into a ASCII character. Because of this, we have a trigger and a UDF (just like Firebird!) but with a twist! The UDF is defined on the PHP side of things instead of SQL. SQLite also demands that it's data be encoded before being sent off.

Other notes:
- SQLite installs again :D
- Firebird nearly installs again :P
- Database backup is not screwed up :P

P.S.
I hope nothing broke :D


git-svn-id: file:///svn/phpbb/trunk@6209 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-07-24 10:08:36 +00:00
Meik Sievertsen
4f7c52e9e3 fix some bugs... again. :)
git-svn-id: file:///svn/phpbb/trunk@6165 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-07-10 15:55:10 +00:00
David M
9b0d2143bb what? yeah...
- turns out the backup issue was not a backup issue but a schema issue
- let there be color


git-svn-id: file:///svn/phpbb/trunk@6105 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-06-20 00:09:45 +00:00
Meik Sievertsen
b0c3e39582 - removed db cache (might re-appear, but for now we do not see the need for it)
- all changes to styles/subsilver/template are purely cosmetic (no functional changes)
- cosmetics
- bugfixes
- add index to modules table
- use modules ordering code for forums too


git-svn-id: file:///svn/phpbb/trunk@6073 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-06-16 16:54:51 +00:00
Meik Sievertsen
75b3410e83 erm, ok, my fault. :/
git-svn-id: file:///svn/phpbb/trunk@6067 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-06-14 22:09:09 +00:00
Meik Sievertsen
1aac08acc0 make sure custom profile fields are created correctly on registration (#2225)
git-svn-id: file:///svn/phpbb/trunk@6058 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-06-13 21:06:29 +00:00
Meik Sievertsen
01b4145381 - fixed a few bugs
- added user_add() function
- check posted images ([img]) for same domain/scipt and php files
- auth_api.html updated to the coding guidelines look&feel
- introduced ability to force non page-updates (cron is using it)
- correctly resend coppa email


git-svn-id: file:///svn/phpbb/trunk@6048 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-06-11 18:13:52 +00:00
David M
4613de6f87 - BBCode bugs
- PostgreSQL now gives us database info (if you are running 8.1 or have the dbsize contrib module installed)


git-svn-id: file:///svn/phpbb/trunk@6042 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-06-10 16:51:24 +00:00
Meik Sievertsen
d5b6b9cf85 - get every bbcode tpl block defined within bbcode.html. ;) (#1889)
git-svn-id: file:///svn/phpbb/trunk@5977 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-05-28 15:42:06 +00:00
Meik Sievertsen
9fca29eae3 some tiny changes...
git-svn-id: file:///svn/phpbb/trunk@5967 89ea8834-ac86-4346-8a33-228a782c2dd0
2006-05-26 15:04:27 +00:00