makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-21 02:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
13333 commits 18 branches 192 tags 207 MiB
Commit graph

13333 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Oleg Pudeyev
3df8b214cc [ticket/10309] Coding guidelines fix. 
PHPBB3-10309
 2011-08-09 21:16:38 -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
Igor Wiedler
11d20e0ec4 [ticket/9608] Revert changes to normalizer 
They were breaking the tests.

PHPBB3-9608
 2011-08-08 08:58:52 +02:00
Nils Adermann
55e4dfd3bd Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10313] Create a separate build task for slow tests.
 2011-08-07 21:34:46 -04:00
Nils Adermann
b85cd7a431 Merge branch 'ticket/naderman/10313' into develop-olympus 
* ticket/naderman/10313:
  [ticket/10313] Create a separate build task for slow tests.
 2011-08-07 21:34:24 -04:00
Nils Adermann
32e15315a8 [ticket/10313] Create a separate build task for slow tests. 
PHPBB3-10313
 2011-08-07 21:28:35 -04:00
Chris Smith
35b0badcf3 Merge branch 'task/naderman/whitelist-code-coverage' into develop 
* task/naderman/whitelist-code-coverage:
  [task/whitelist-code-coverage] Load all of includes/ into code coverage report
 2011-08-08 01:34:07 +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
Nils Adermann
4c8c76171f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10313] Include slow unit tests when running build script.
 2011-08-07 19:19:47 -04:00
Nils Adermann
abc0c336af Merge remote-tracking branch 'github-bantu/ticket/10313' into develop-olympus 
* github-bantu/ticket/10313:
  [ticket/10313] Include slow unit tests when running build script.
 2011-08-07 19:19:37 -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
Andreas Fischer
43fc8142f5 [ticket/10313] Include slow unit tests when running build script. 
PHPBB3-10313
 2011-08-08 01:11:44 +02: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
f997199679 [ticket/10309] Write unicode data to tests/tmp. 
When the tests are run by a different user than the one which owns
phpbb source tree, writes will go into a single, known directory.

PHPBB3-10309
 2011-08-07 16:17:20 -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
Igor Wiedler
24e9fb24d1 [feature/request-class] Make server() use the $html_encode parameter 
$request->server() should not auto html-escape values. header() however should.
Also introduce some tests for this behaviour.

Thanks to nn- for catching this.

PHPBB3-9716
 2011-08-06 19:47:12 +02: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
66867b5ac0 Merge remote-tracking branch 'cs278/ticket/10303' into develop-olympus 
* cs278/ticket/10303:
  [ticket/10303] Removed HTTP_VERSION code path from send_status_line().
 2011-08-04 22:56:20 -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
Joas Schilling
c2866f5245 [ticket/10300] Always set group attributes for teampage and legend 
The code in acp_groups.php removes unchanged attributes from the
group_attributes array, to prevent issues with reapplying avatar/rank and more.
This code causes problems with the new teampage/legend feature, because when
the attribute is not set, the group is removed from the feature. Therefore I
added an array with the keys that need to be set, when calling the function.

PHPBB3-10300
 2011-08-02 16:56:21 +02: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
Joas Schilling
bb7e8bb424 [ticket/9976] Fix link to post when two posts have the same post_time. 
When two posts have the same post_time, a link to the first post being on
page 1, leads you to the second post with the same timestamp on page two.
So in case the post_times are equal, we need to use the post_id to correctly
order the posts.

PHPBB3-9976
 2011-07-30 23:46:53 -04: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