Commit graph

11697 commits

Author SHA1 Message Date
Igor Wiedler
850741ee16 Merge remote branch 'bantu/ticket/10145' into develop-olympus
* bantu/ticket/10145:
  [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
2011-04-26 21:49:21 +02:00
Andreas Fischer
9a4e71ac1a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7941] Added @return to generate_board_url docstring.
2011-04-26 19:36:48 +02:00
Andreas Fischer
569a4b2091 Merge remote branch 'p/ticket/7941' into develop-olympus
* p/ticket/7941:
  [ticket/7941] Added @return to generate_board_url docstring.
2011-04-26 19:35:49 +02:00
Andreas Fischer
a3a70e13b5 [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
PHPBB3-10145
2011-04-26 12:35:44 +02:00
Igor Wiedler
427a5122d5 [feature/template-engine] Fix negative variable expressions
compile_tag_if had the flawed approach of adding an isset statement for
all variables to the beginning of the if. This fails for negative
expressions, and checking those takes a considerable effort.

The easier solution is to make the variable expression itself
conditional, defaulting to null if it is not set.

Thanks to naderman for the solution.

PHPBB3-9726
2011-04-25 23:19:36 -04:00
Oleg Pudeyev
f0b97cfdcf [feature/template-engine] Added a test for reuse of loop identifiers.
This currently does not pass, thus it is commented out.

The reuse appears implausible in the same file, however it may be
also done across template files where it is much harder to detect.

PHPBB3-9726
2011-04-25 23:19:32 -04:00
Oleg Pudeyev
f97411b911 [feature/template-engine] Corrected miscompilation of loop size constructs.
PHPBB3-9726
2011-04-25 23:19:25 -04:00
Oleg Pudeyev
8d5e468eb4 [feature/template-engine] Created a script to compile templates.
Script takes path to template as the only argument and outputs
the compiled template to standard output.

PHPBB3-9726
2011-04-24 23:13:44 -04:00
Oleg Pudeyev
5afc0b9b90 [feature/template-engine] Corrected an off-by-one error in nested namespaces.
This error resulted in a dot from the namespace being placed into
variable reference in compiled template code, thus creating bogus
compiled template code.

PHPBB3-9726
2011-04-24 23:13:13 -04:00
Oleg Pudeyev
e10d62badc [feature/template-engine] Added a test for multilevel references in loops.
This currently fails.

This test is a reduced version of permission_mask template in acp, which
is not correctly compiled by the current template engine code.

PHPBB3-9726
2011-04-24 21:56:26 -04:00
Oleg Pudeyev
5c3ebb3465 [feature/template-engine] Deleted silencing of notices.
The code is now supposed to be notice-free, therefore there is no need
to have the notices silenced.

PHPBB3-9726
2011-04-24 21:22:43 -04:00
Oleg Pudeyev
a2c75f6053 [feature/template-engine] Deleted $template from phpbb_template_compile class.
phpbb_template_compile is now much simpler. It takes complete file paths
as inputs, either source template path or source template path and output
compiled template path. The number of methods also went down to two -
compile template and returned compiled text or compile and write to file.

phpbb_compile class is responsible for determining source and compiled
paths. It already had all the data necessary for this, now the code is
in the same place as the data it uses.

PHPBB3-9726
2011-04-24 21:18:18 -04:00
Oleg Pudeyev
8fc748770a Merge branch 'feature/rxu/attachment-management-no-reassignment' into develop
* feature/rxu/attachment-management-no-reassignment:
  [feature/attachment-management-no-reassignment] Handle privacy and some more.
  [feature/attachment-management-no-reassignment] Further feature adjustments.
  [feature/attachment-management-no-reassignment] Fix some more errors
  [feature/attachment-management-no-reassignment] Fix minor flaws in the code.
  [feature/attachment-management-no-reassignment] Attachments management
2011-04-24 14:29:59 -04:00
rxu
baba66a229 [feature/attachment-management-no-reassignment] Handle privacy and some more.
- restrict files info for PM attachments;
- add an option to resync files stats if wrong;
- replace post_id sorting with post type (PM/regular post) one;
- some language fixes.

PHPBB3-9721
2011-04-24 23:33:51 +08:00
Andreas Fischer
026358ec72 Merge remote branch 'p/ticket/10148' into develop
* p/ticket/10148:
  [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.
2011-04-24 17:31:45 +02:00
Andreas Fischer
1ec2ab6689 Merge remote branch 'p/ticket/10143' into develop
* p/ticket/10143:
  [ticket/10143] Added tests for storing a previously deleted value in db cache.
2011-04-24 17:31:33 +02:00
Igor Wiedler
81962d1d8f [ticket/9924] Pass template instance into $template->display hook
This is a cherry-pick of 053cf790a9
which appears to have been partially reverted here.

PHPBB3-9924
2011-04-24 11:23:46 -04:00
Oleg Pudeyev
c8db531fcb [feature/template-engine] Removed a useless space.
PHPBB3-9726
2011-04-24 01:59:40 -04:00
Oleg Pudeyev
dfbbc4797e [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.
PHPBB3-10148
2011-04-24 01:35:09 -04:00
Oleg Pudeyev
321ecf4273 [feature/template-engine] Delete class_exists checks, rely on autoloading.
PHPBB3-9726
2011-04-24 01:18:58 -04:00
Oleg Pudeyev
f29f32e0d6 [feature/template-engine] Allow leading underscores in variable names.
Subsilver uses ._file in overall_header.

PHPBB3-9726
2011-04-24 01:08:48 -04:00
Oleg Pudeyev
203187a841 [feature/template-engine] Fix recompilation logic.
Do not change $recompile from true to false - any recompilation
condition alone is sufficient to force recompilation.

Also uncomment the nonexistent file test which passes with this fix.

PHPBB3-9726
2011-04-24 01:08:48 -04:00
Oleg Pudeyev
4dfe4c7f13 [feature/template-engine] Adjust path in includephp template.
Now that tests are run from top level the '..' is wrong.

PHPBB3-9726
2011-04-24 01:08:30 -04:00
Oleg Pudeyev
4f3e966fdc [feature/template-engine] Delete ?>, add newline at EOF.
PHPBB3-9726
2011-04-23 22:49:08 -04:00
Marek A. Ruszczynski
2d11e1c095 [feature/template-engine] Improved template engine.
PHPBB3-9726
2011-04-23 22:49:02 -04:00
Marek A. Ruszczynski
4b646c6c80 [feature/template-engine] Update tests.
PHPBB3-9726
2011-04-23 22:48:50 -04:00
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
Andreas Fischer
8a97722464 Merge branch 'ticket/p/10147' into develop-olympus
* ticket/p/10147:
  [ticket/10147] Corrected a typo in includes/functions_template.php.
2011-04-23 21:51:49 +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
Andreas Fischer
ca0a066854 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10141] Save a hash lookup when value is not in cache.
  [ticket/10141] Split double-assignment into conditional and unconditional part.
  [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
2011-04-22 11:17:39 +02:00
Andreas Fischer
bc48fe1704 Merge branch 'ticket/p/10141' into develop-olympus
* ticket/p/10141:
  [ticket/10141] Save a hash lookup when value is not in cache.
  [ticket/10141] Split double-assignment into conditional and unconditional part.
  [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
2011-04-22 11:16:32 +02:00
Andreas Fischer
9cb6a69861 [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).
PHPBB3-10146
2011-04-22 11:01:07 +02:00
Oleg Pudeyev
f08880e2c4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
2011-04-22 00:16:37 -04:00
Oleg Pudeyev
0a8893498d Merge branch 'ticket/bantu/10137' into develop-olympus
* ticket/bantu/10137:
  [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
2011-04-22 00:16:21 -04:00
Oleg Pudeyev
2a566b0863 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10105] Update AIM express link.
  [ticket/10105] Update AIM application download link.
2011-04-22 00:04:51 -04:00
Oleg Pudeyev
ff5274181c Merge branch 'ticket/bantu/10105' into develop-olympus 2011-04-22 00:03:02 -04:00
Oleg Pudeyev
f49656986c [ticket/10141] Save a hash lookup when value is not in cache.
PHPBB3-10141
2011-04-21 23:15:51 -04:00
Oleg Pudeyev
5e7c945de9 [ticket/10143] Added tests for storing a previously deleted value in db cache.
PHPBB3-10143
2011-04-21 23:00:25 -04:00
Andreas Fischer
8c3cfbb40e [ticket/10105] Update AIM express link.
PHPBB3-10105
2011-04-22 00:42:49 +02:00
Andreas Fischer
78fa3a3b03 [ticket/10105] Update AIM application download link.
PHPBB3-10105
2011-04-22 00:41:55 +02:00
Andreas Fischer
6ee6245e5b [ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
PHPBB3-10137
2011-04-22 00:30:13 +02:00
Andreas Fischer
b1367bce48 [ticket/10141] Split double-assignment into conditional and unconditional part.
PHPBB3-10141
2011-04-22 00:20:09 +02:00
Oleg Pudeyev
37b38abec6 Merge branch 'ticket/bantu/10139' into develop 2011-04-21 04:43:27 -04:00
Bart van Bragt
11dd4b54fa [ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
Many sequences being converted are the same. Use a local cache to
convert each sequence once, speeding up the function.

PHPBB3-10141
2011-04-21 04:21:09 -04:00
Andreas Fischer
d1f1d8ade7 [ticket/9802] Remove unnecessary htmlspecialchars() call on REMOTE_ADDR.
The value in $_SERVER['REMOTE_ADDR'] is either validated to be a valid IP
address or is replaced by our default value. Valid IP addresses do not contain
HTML special characters, thus the htmlspecialchars() call is unnecessary.

PHPBB3-9802
2011-04-19 14:10:23 +02:00
Andreas Fischer
5ca7121ed2 [ticket/9802] Only check for IPv4-mapped address when address is IPv6.
PHPBB3-9802
2011-04-19 14:08:23 +02:00
Andreas Fischer
bef2540d9c [ticket/9802] Fix tiny logic bug in loop determining REMOTE_ADDR.
When $ip is empty() it was assigned to $this->ip.

PHPBB3-9802
2011-04-19 13:46:00 +02:00
Andreas Fischer
fd80535859 [ticket/9802] Remove redundant character class definition from preg_replace.
PHPBB3-9802
2011-04-19 13:22:48 +02:00
Andreas Fischer
ee6167879e [ticket/9802] Fix redundant str_replace call. No need to replace ' ' with ' '.
PHPBB3-9802
2011-04-19 13:22:23 +02:00
Erik Frèrejean
1d2201902f [ticket/9961] Create log entries when users are activated.
* Create log entries when a user activates own account without
   also changing their password.

 * Additionally create admin log entries when an administrator activates
   user accounts.

PHPBB3-9961
2011-04-19 13:11:20 +02:00