1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 12:05:37 +02:00

11052 Commits

Author SHA1 Message Date
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
41de09e408 [feature/template-engine] Delete _get_locator function.
It is no longer needed as locator is injected into template.

PHPBB3-9726
2011-08-13 23:49:54 -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
fb8a1d999f [feature/template-engine] Need to call set_template on template.
PHPBB3-9726
2011-08-09 23:33:47 -04:00
Oleg Pudeyev
60372b43c2 [feature/template-engine] Update installer for template engine changes.
PHPBB3-9726
2011-08-09 23:28:56 -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
66232035aa [feature/template-engine] Delete useless code from set_template.
set_custom_template performs these calls, repeating them in
set_template is not needed.

PHPBB3-9726
2011-08-09 23:20:54 -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
4754e11d67 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10240] Added code to strip control characters from messages.
2011-08-09 21:33:36 -04:00
Oleg Pudeyev
cad3e4cb45 Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympus
* callumacrae/ticket/10240:
  [ticket/10240] Added code to strip control characters from messages.
2011-08-09 21:30:37 -04:00
Callum Macrae
f9dbe33fa7 [ticket/10240] Added code to strip control characters from messages.
It is possible to evade the word filter using control characters.

Seeing as control characters have no practical application in a bulletin
board software, it doesn't do any harm to remove them entirely. That is
what this commit does.

PHPBB3-10240
2011-08-08 17:43:28 +01:00
Nils Adermann
c24249ae55 [task/whitelist-code-coverage] Load all of includes/ into code coverage report
PHPBB3-10314
2011-08-07 20:14:53 -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
db257956aa [feature/template-engine] Corrected an error message in template locator.
PHPBB3-9726
2011-08-07 19:17:22 -04:00
Oleg Pudeyev
f3befa4b29 [feature/template-engine] Remaining documentation.
PHPBB3-9726
2011-08-07 19:07:27 -04:00
Oleg Pudeyev
c7115a2f01 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10298] Properly close embed tag for QuickTime in subsilver2.
2011-08-07 16:40:56 -04:00
Oleg Pudeyev
04e8468d28 Merge remote-tracking branch 'bantu/ticket/10298' into develop-olympus
* bantu/ticket/10298:
  [ticket/10298] Properly close embed tag for QuickTime in subsilver2.
2011-08-07 16:35:31 -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
Oleg Pudeyev
eb4660f4ef Merge remote-tracking branch 'naderman/ticket/8937' into develop-olympus
* naderman/ticket/8937:
  [ticket/8937] Keep space characters in front of [code] bbcode content
2011-08-07 16:23:26 -04:00
Oleg Pudeyev
02fc533066 [feature/template-engine] More documentation for template class.
PHPBB3-9726
2011-08-07 15:42:04 -04:00
Oleg Pudeyev
0b381516a0 [feature/template-engine] Create load_and_render to reduce code duplication.
PHPBB3-9726
2011-08-07 15:35:35 -04:00
Oleg Pudeyev
88eb822126 Merge branch 'ticket/imkingdavid/10290' into develop
* ticket/imkingdavid/10290:
  [ticket/10290] Fixed malformed SQL query in viewonline.php
2011-08-04 23:16:59 -04:00
David King
554ec1cbd4 [ticket/10290] Fixed malformed SQL query in viewonline.php
As per Oleg's suggestion, the offending equals sign was removed
so that the query did not return an error.

PHPBB3-10290
2011-08-04 23:16:23 -04:00
Oleg Pudeyev
22389d4324 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
2011-08-04 23:11:16 -04:00
Oleg Pudeyev
ec3f4db425 Merge remote-tracking branch 'bantu/ticket/10299' into develop-olympus
* bantu/ticket/10299:
  [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
2011-08-04 23:07:06 -04:00
Oleg Pudeyev
0bfd4639ab Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10303] Removed HTTP_VERSION code path from send_status_line().
2011-08-04 23:05:35 -04:00
Oleg Pudeyev
52f208900f [feature/template-engine] Get rid of orig_tpl_* in template engine.
The origins of orig_tpl_* are not pretty. Please see the following commits
and associated tickets: r9823, r9839, r9847, r10150, r10460.

In short, multiple hacks were required due to template engine reading
inheritance/storedb flags from $user (global) even when the template that
was being looked up or rendered was not the "active style of the
current user".

We no longer store templates in the database, removing half of the problem.
This commit fixes the second half of the problem by deleting
set_template_path function from template locator, and moving that logic
back into the template class' set_template. set_template now calls
set_custom_template, the latter only taking the template path and the
fallback paths as parameters. With this change template locator no longer
uses $user and does not use phpbb root path either.

All logic involving setting the user's "active" template is now
encapsulated in a single template class's function, set_template.
Setting other templates is done via set_custom_template and the caller
is responsible for determining and passing in fallback/inheritance path,
if any.

PHPBB3-9726
2011-08-04 21:45:42 -04:00
Oleg Pudeyev
1a6250d8b6 [feature/template-engine] Delete $style_name param from locator's set_custom_template.
This parameter was unused, it was only used by template's set_custom_template
to determine cache file prefix.

PHPBB3-9726
2011-08-04 21:24:40 -04:00
Oleg Pudeyev
13536f2be5 [feature/template-engine] Add constructor to template locator.
PHPBB3-9726
2011-08-04 21:23:06 -04:00
Chris Smith
cc87d553d0 [ticket/10303] Removed HTTP_VERSION code path from send_status_line().
PHPBB3-10303
2011-08-05 01:17:57 +01:00
Andreas Fischer
08ca84a3e7 [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
PHPBB3-10299
2011-07-31 15:34:45 +02:00
Oleg Pudeyev
124b8a92ec Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8173] Removed some redundant code in the BBCode JavaScript.
2011-07-30 19:37:24 -04:00
Oleg Pudeyev
edb745e951 Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympus
* callumacrae/ticket/8173:
  [ticket/8173] Removed some redundant code in the BBCode JavaScript.

Conflicts:
	phpBB/adm/style/acp_users_signature.html
2011-07-30 19:33:41 -04:00
Oleg Pudeyev
139f8e84d8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9645] Added code to repair invalid anchor names in acp_php_info.
2011-07-30 18:55:32 -04:00
Oleg Pudeyev
5653be8e16 Merge remote-tracking branch 'callumacrae/ticket/9645' into develop-olympus
* callumacrae/ticket/9645:
  [ticket/9645] Added code to repair invalid anchor names in acp_php_info.
2011-07-30 18:47:54 -04:00
Oleg Pudeyev
a8ee16b82d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10293] Fixed the JavaScript in the jumpbox.
2011-07-30 18:36:15 -04:00
Oleg Pudeyev
7ebec68616 Merge remote-tracking branch 'callumacrae/ticket/10293' into develop-olympus
* callumacrae/ticket/10293:
  [ticket/10293] Fixed the JavaScript in the jumpbox.
2011-07-30 18:36:04 -04:00
Oleg Pudeyev
05b71ca04e [feature/template-engine] Factor template locator out of template class.
Template locator is responsible for maintaining mapping from template
handles to filenames and paths, and provides resolution services
using these mappings.

Template locator is aware of template inheritance and is capable of
checking template file existence on the filesystem.

PHPBB3-9726
2011-07-30 17:06:22 -04:00
Oleg Pudeyev
4126a571ac [feature/template-engine] Delete $files_template property.
This seems to have been used for db storage of templates.
We no longer offer db storage of templates, and thus currenty
$files_template is only written to but not read anywhere.

PHPBB3-9726
2011-07-30 15:20:25 -04:00
Andreas Fischer
d59a894cd3 [ticket/10298] Properly close embed tag for QuickTime in subsilver2.
PHPBB3-10298
2011-07-30 16:58:33 +02:00
Andreas Fischer
366b14b6c5 Merge remote-tracking branch 'igorw/ticket/10258' into develop
* igorw/ticket/10258:
  [ticket/10258] Add HTML5 meta charset tag
2011-07-30 16:49:39 +02:00
Andreas Fischer
cb74439046 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10199] Delete a useless join in viewtopic.
2011-07-30 16:45:37 +02:00
Andreas Fischer
25902c3bfc Merge remote-tracking branch 'p/ticket/10199' into develop-olympus
* p/ticket/10199:
  [ticket/10199] Delete a useless join in viewtopic.
2011-07-30 16:44:27 +02:00
Andreas Fischer
9fd849b3fd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10263] Fix comment about return value of phpbb_version_compare().
2011-07-30 16:44:08 +02:00
Andreas Fischer
bd2fd4ec1d Merge remote-tracking branch 'bantu/ticket/10263' into develop-olympus
* bantu/ticket/10263:
  [ticket/10263] Fix comment about return value of phpbb_version_compare().
2011-07-30 16:43:37 +02:00
Callum Macrae
9c6339fb57 [ticket/8173] Removed some redundant code in the BBCode JavaScript.
The following code can be found in the ACP, when changing a user's
signature:

t: '{ BBCODE_T_HELP }',

The code that uses it and the code that produces it were changed or
removed a while ago, but this code remained. In 2c4c1f9, the accesskey
for the list item button was changed to y from t, explaining the origin of
the redundant code - although it wasn't being used then, either.

This commit also changes the helpline code of "[*]" to y, as the access
key is y, so this makes it more consistent.

PHPBB3-8173
2011-07-30 08:57:17 +01:00
Oleg Pudeyev
b960dd4e0d Merge remote-tracking branch 'callumacrae/ticket/10032' into develop-olympus
* callumacrae/ticket/10032:
  [ticket/10032] Fixed typos in bbcode button name.
2011-07-30 00:48:03 -04:00
Oleg Pudeyev
45b19e6419 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10032] Fixed typos in bbcode button name.
2011-07-30 00:45:31 -04:00
Oleg Pudeyev
43b5ca32be Merge remote-tracking branch 'callumacrae/ticket/10032' into develop-olympus
* callumacrae/ticket/10032:
  [ticket/10032] Fixed typos in bbcode button name.
2011-07-30 00:45:17 -04:00