Commit graph

13165 commits

Author SHA1 Message Date
Andreas Fischer
83dfe0d22c [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
There is no support for IPv6 addresses in the blacklists we check right now.

PHPBB3-10195
2011-05-26 10:56:46 +02:00
Andreas Fischer
9c04aef153 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10192] Add missing semicolon
2011-05-23 23:59:56 +02:00
Andreas Fischer
7da88f9103 Merge remote-tracking branch 'erikfrerejean/ticket/10192' into develop-olympus
* erikfrerejean/ticket/10192:
  [ticket/10192] Add missing semicolon
2011-05-23 23:59:45 +02:00
Andreas Fischer
09776d2302 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
2011-05-23 23:56:55 +02:00
Andreas Fischer
e0ce73e3b8 Merge remote-tracking branch 'p/ticket/9630' into develop-olympus
* p/ticket/9630:
  [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
2011-05-23 23:56:31 +02:00
Joas Schilling
67449f8f1b [ticket/10158] Only view "Return to" links if they are useful.
PHPBB3-10158
2011-05-23 12:03:04 +02:00
Erik Frèrejean
b5e5ed0033 [ticket/10192] Add missing semicolon
if the index has to be recreated it will run into the private message
table query.

PHPBB3-10192
2011-05-23 11:00:58 +02:00
Andreas Fischer
93a8c54bcb Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10191] Use ob_get_level in exit_handler for output buffering check.
2011-05-23 10:20:59 +02:00
Andreas Fischer
e4681f0929 Merge remote-tracking branch 'p/ticket/10191' into develop-olympus
* p/ticket/10191:
  [ticket/10191] Use ob_get_level in exit_handler for output buffering check.
2011-05-23 10:18:49 +02:00
Andreas Fischer
fe3f3bc839 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10188] Use ob_get_level in msg_handler for output buffering check.
2011-05-23 10:17:26 +02:00
Andreas Fischer
00a4ace573 Merge remote-tracking branch 'p/ticket/10188' into develop-olympus
* p/ticket/10188:
  [ticket/10188] Use ob_get_level in msg_handler for output buffering check.
2011-05-23 10:14:40 +02:00
Andreas Fischer
0aa6398163 Merge remote-tracking branch 'p/ticket/10156' into develop
* p/ticket/10156:
  [ticket/10156] Fix new cron on windows.
2011-05-23 10:13:08 +02:00
Oleg Pudeyev
44cc8153cd [ticket/10191] Use ob_get_level in exit_handler for output buffering check.
Calling flush() when output buffering is enabled causes output to be
duplicated. Besides phpBB enabling output buffering for gzip compression,
output buffering may be enabled externally to phpBB via output_handler
or output_buffering directives in php.ini.

Use ob_get_level to determine whether output buffering is active and
call ob_flush in that case.

PHPBB3-10191
2011-05-22 07:16:40 -04:00
Oleg Pudeyev
9b62500a10 [ticket/10188] Use ob_get_level in msg_handler for output buffering check.
Output buffering may be enabled via various approaches, among them:

 * output_buffering in php.ini;
 * output_handler in php.ini enables output_buffering;
 * ob_start call.

ob_get_level allows us to query php runtime for the actual output buffering
status.

PHPBB3-10188
2011-05-22 06:48:59 -04:00
Oleg Pudeyev
f9307531a7 Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop
* nickvergessen/ticket/8542:
  [ticket/8542] Display custom profile fields in private messages

Conflicts:
	phpBB/install/database_update.php
2011-05-20 19:50:29 -04:00
Joas Schilling
8fa44cc3b9 [ticket/8542] Display custom profile fields in private messages
Introduce an option to display the cpf in the PM view.

PHPBB3-8542
2011-05-20 16:45:29 +02:00
Oleg Pudeyev
1d26398faa [feature/template-engine] Fixed copyright year.
PHPBB3-9726
2011-05-19 22:55:08 -04:00
Oleg Pudeyev
f231590c7b [ticket/10156] Fix new cron on windows.
PHPBB3-10156
2011-05-19 22:34:18 -04:00
Oleg Pudeyev
6ae5a64f6c [feature/template-engine] Fixed absolute path PHP includes, added test.
PHPBB3-9726
2011-05-19 12:18:16 -04:00
Oleg Pudeyev
efda4da19f [feature/template-engine] Moved includephp test to its own file.
PHPBB3-9726
2011-05-18 10:57:04 -04:00
Oleg Pudeyev
f24d858cff [feature/template-engine] Added tests for template inheritance.
PHPBB3-9726
2011-05-18 10:51:33 -04:00
Oleg Pudeyev
20b4df2853 [feature/template-engine] Delete useless template require.
It is now handled by autoloading.

PHPBB3-9726
2011-05-18 10:36:17 -04:00
Oleg Pudeyev
52c4726b5b Merge remote-tracking branch 'bantu/ticket/10173' into develop
* bantu/ticket/10173:
  [ticket/10173] Use correct variable, checking for $birthday_year was correct.
  [ticket/10173] Only calculate age if year is not false as per nn-.
  [ticket/10173] Use an array for the legacy birthday list as per rxu.
  [ticket/10173] Use a loop var for the birthdays list to allow proper templating
2011-05-15 02:15:16 -04:00
Oleg Pudeyev
7d911e0bc1 [feature/template-engine] Delete @version everywhere.
This is not used since the switch to git.

PHPBB3-9726
2011-05-14 15:30:20 -04:00
Oleg Pudeyev
70ccf04e06 [feature/template-engine] Moved phpbb_template_filter into own file.
PHPBB3-9726
2011-05-14 15:30:20 -04:00
Oleg Pudeyev
b04f0a5f70 [feature/template-engine] Delete @access everywhere.
Access specification in php 5 is done directly on functions/properties.

PHPBB3-9726
2011-05-14 15:30:20 -04:00
Oleg Pudeyev
be8fc0864c [feature/template-engine] Added a test for inclusion of php files from subdir.
PHPBB3-9726
2011-05-14 15:30:20 -04:00
Patrick Webster
94c28efe07 [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.
PHPBB3-10039
2011-05-13 19:43:17 -04:00
Oleg Pudeyev
457758ef4a Merge remote-tracking branch 'bantu/ticket/10146-develop' into develop
* bantu/ticket/10146-develop:
  [ticket/10146] Fix Firebird DECIMAL precision issue on develop.
2011-05-13 19:35:09 -04:00
Oleg Pudeyev
1c90fc6a72 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).

Merged with -X ours, develop-olympus fix for PHPBB3-10146 does not apply
to develop.
2011-05-13 19:33:50 -04:00
Oleg Pudeyev
5e81b058cf Merge remote-tracking branch 'bantu/ticket/10146' into develop-olympus
* bantu/ticket/10146:
  [ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).
2011-05-13 19:32:35 -04:00
Oleg Pudeyev
94560d7086 [feature/template-engine] Make INCLUDEPHP relative to board root.
PHPBB3-9726
2011-05-12 20:13:32 -04:00
Oleg Pudeyev
d2ac05aa74 [feature/template-engine] Replaced globals with dependency injection.
PHPBB3-9726
2011-05-12 20:13:31 -04:00
Oleg Pudeyev
581374c9c3 [feature/template-engine] Deleted useless catch.
In tests there is no need to catch unexpected exceptions.

PHPBB3-9726
2011-05-12 20:13:31 -04:00
Oleg Pudeyev
ac9a910c64 [feature/template-engine] Delete obsolete comments pertaining to notices.
PHPBB3-9726
2011-05-12 20:13:31 -04:00
Oleg Pudeyev
345852d240 [feature/template-engine] Clarify cache directory path for set_custom_template
Even if the template may be outside of phpBB, phpBB's cache directory
is still going to be used for storing compiled template code.

PHPBB3-9726
2011-05-12 20:13:31 -04:00
Oleg Pudeyev
d2daaf0317 [feature/template-engine] Try to handle failed template includes.
PHPBB3-9726
2011-05-12 20:13:31 -04:00
Oleg Pudeyev
7638bcb560 [feature/template-engine] Rename $filename to $compiled_path for clarity.
PHPBB3-9726
2011-05-12 20:13:31 -04:00
Oleg Pudeyev
7778771819 [feature/template-engine] Move DEBUG_EXTRA check for $recompile up.
PHPBB3-9726
2011-05-12 20:13:31 -04:00
Oleg Pudeyev
504acaba6b [feature/template-engine] Deleted useless assignment.
PHPBB3-9726
2011-05-12 20:13:31 -04:00
Oleg Pudeyev
d6f75e97d6 [feature/template-engine] Added docblocks to get_*_ref in context.
PHPBB3-9726
2011-05-12 20:13:31 -04:00
Oleg Pudeyev
635460fa6d [feature/template-engine] Fixed reference usage.
Hopefully this is right, I have not checked it against the manual
(assuming the manual even covers these things).

PHPBB3-9726
2011-05-12 20:13:31 -04:00
Oleg Pudeyev
169c4377e9 [feature/template-engine] Disposed of underscores in property names.
PHPBB3-9726
2011-05-12 20:13:31 -04:00
Oleg Pudeyev
97d2a6527e [feature/template-engine] Remove commented out error reporting logic.
PHPBB3-9726
2011-05-12 20:13:30 -04:00
Oleg Pudeyev
0ca7ad66dc [feature/template-engine] Refactor hook logic into a separate function.
PHPBB3-9726
2011-05-12 20:13:30 -04:00
Oleg Pudeyev
df76885b11 [feature/template-engine] Reinstate phpbb_template#destroy function.
PHPBB3-9726
2011-05-12 20:13:30 -04:00
Oleg Pudeyev
0462ab3a4a [feature/template-engine] Add back IN_PHPBB preamble.
PHPBB3-9726
2011-05-12 20:13:30 -04:00
Andreas Fischer
1f4b4aee9d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10186] UCP signature panel displays when not authed for signatures
2011-05-13 01:29:57 +02:00
Andreas Fischer
46110d8cef Merge remote-tracking branch 'p/ticket/10186' into develop-olympus
* p/ticket/10186:
  [ticket/10186] UCP signature panel displays when not authed for signatures
2011-05-13 01:29:00 +02:00
RMcGirr83
f6fa52540c [ticket/10186] UCP signature panel displays when not authed for signatures
The signature panel link was displayed even when a user did not have the
auths to create/edit their signature. Clicking on the link gave a
trigger_error of "Not authorised to have a signature". Hide the link
when user does not have permissions to edit their signature.

PHPBB3-10186
2011-05-12 19:25:20 -04:00