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

4590 Commits

Author SHA1 Message Date
Andreas Fischer
3a0a18ee25 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9946] Allow storage of data >4kB on Oracle again
2011-03-24 09:22:36 +01:00
Andreas Fischer
6ac93d8a00 Merge branch 'ticket/jellydoughnut/9946' into develop-olympus
* ticket/jellydoughnut/9946:
  [ticket/9946] Allow storage of data >4kB on Oracle again
2011-03-24 09:22:12 +01:00
Igor Wiedler
c63676e802 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10033] "Disallow usernames" does not check already disallowed names.
2011-03-23 23:21:36 +01:00
Joas Schilling
1564c01c38 [ticket/10033] "Disallow usernames" does not check already disallowed names.
PHPBB3-10033
2011-03-23 22:48:22 +01:00
Oleg Pudeyev
352ed5acf8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10101] Add test case for native phpass hashes
  [ticket/10101] Add support for native phpass hashes
2011-03-22 21:25:14 -04:00
Oleg Pudeyev
200c7e3c44 Merge branch 'ticket/igorw/10101' into develop-olympus
* ticket/igorw/10101:
  [ticket/10101] Add test case for native phpass hashes
  [ticket/10101] Add support for native phpass hashes
2011-03-22 21:25:00 -04:00
Igor Wiedler
df8b852709 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10100] Update rand_seed_last_update before rand_seed in unique_id().
2011-03-18 00:06:53 +01:00
Igor Wiedler
f8384b7302 [ticket/10101] Add support for native phpass hashes
phpass (the hashing library we use) adds a hash identifier to every
hash. By default this identifier is '$P$'. For some reason we have
changed it to '$H$'.

This patch allows both of them to be used for authentication, so that a
third party system could create users with '$P$' hashes.

PHPBB3-10101
2011-03-17 23:59:38 +01:00
Andreas Fischer
48ba841be0 [ticket/10100] Update rand_seed_last_update before rand_seed in unique_id().
Update $config['rand_seed_last_update'] before updating $config['rand_seed'] in
unique_id() to mitigate a race condition and unnecessary updates on heavily
busy boards.

PHPBB3-10100
2011-03-17 23:07:35 +01:00
Andreas Fischer
0e9b755667 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9685] Buffer posts for search indexing when using mssqlnative.
2011-03-15 02:00:04 +01:00
Andreas Fischer
784132d7e8 Merge branch 'ticket/naderman/9685' into develop-olympus
* ticket/naderman/9685:
  [ticket/9685] Buffer posts for search indexing when using mssqlnative.
2011-03-15 01:59:47 +01:00
Nils Adermann
91b3195255 [ticket/9685] Buffer posts for search indexing when using mssqlnative.
To have a generic solution there is now a sql_buffer_nested_transaction()
which indicates that the given SQL driver requires buffering to run a
transaction while iterating over another result set.

PHPBB3-9685
2011-03-15 01:41:16 +01:00
Andreas Fischer
7588b43526 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10096] Fixed whitespace in functions.php.
  [ticket/10078] Avoid \n in strings given to echo for portability.
  [ticket/10092] Ignore overlength comment lines in commit-msg hook.
2011-03-14 13:58:57 +01:00
Oleg Pudeyev
64657ee366 [ticket/10096] Fixed whitespace in functions.php.
PHPBB3-10096
2011-03-13 23:12:52 -04:00
Igor Wiedler
cfede1db83 Merge branch 'ticket/bantu/10046-develop' into develop
* ticket/bantu/10046-develop:
  [ticket/10046] Remove register_shutdown_function() in cron.php from develop.
2011-03-12 18:17:25 +01:00
Igor Wiedler
a27a39ebed Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10046] Do not link bots to cron.php.
  [ticket/10046] No longer change $phpbb_root_path to an absolute path for cron.
  [ticket/10046] Call flush() in cron.php
  [ticket/10046] Remove calls to register_shutdown_function() in cron.php

Conflicts:
	phpBB/cron.php
	phpBB/includes/functions.php
2011-03-12 18:16:10 +01:00
Andreas Fischer
a627133b15 [ticket/10046] Remove register_shutdown_function() in cron.php from develop.
PHPBB3-10046
2011-03-12 15:07:31 +01:00
Oleg Pudeyev
9a48045254 [ticket/10046] Do not link bots to cron.php.
Bots, generally speaking, will not request cron.php immediately,
thus telling them to request it is pointless.

PHPBB3-10046
2011-03-12 14:57:34 +01:00
Oleg Pudeyev
df096b6b52 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9970] Rename validate_language() to validate_language_iso_name().
  [ticket/9970] Do not allow switching to languages not installed on reg. page.
  [ticket/9970] Check whether language pack is installed.
  [ticket/9970] User language input is checked for existance
2011-03-11 21:55:46 -05:00
Oleg Pudeyev
2f57bfb6f2 Merge branch 'ticket/bantu/9970' into develop-olympus
* ticket/bantu/9970:
  [ticket/9970] Rename validate_language() to validate_language_iso_name().
  [ticket/9970] Do not allow switching to languages not installed on reg. page.
  [ticket/9970] Check whether language pack is installed.
  [ticket/9970] User language input is checked for existance
2011-03-11 21:55:40 -05:00
Andreas Fischer
33c38b37d8 Merge branch 'ticket/p/10016' into develop-olympus
* ticket/p/10016:
  [ticket/10016] Add comment for text casting (for PostgreSQL 7.x)
  [ticket/10016] Leave Firebird unchanged.
  [ticket/10016] Fixed varchar to decimal cast on postgresql 7.x.
2011-03-11 01:45:45 +01:00
Oleg Pudeyev
31eb45897a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10057] Fixes for a bunch of small problems.
  [ticket/10035] ACP template edit feature allows to read any files on webserver.
  [ticket/10057] Handle the case of missing interbase extension better.
  [ticket/10057] Fixed wrong usage of sql_error again, in firebird.
  [ticket/10057] Fixed usage of sql_error again.
  [ticket/10057] Condition file/line display on DEBUG_EXTRA or IN_INSTALL.
  [ticket/10057] Fixed wrong usage of sql_error in postgres dbal.
  [ticket/10057] Skip ibase_service_attach if firebird connection failed.
  [ticket/10057] Check for interbase function existence.
  [ticket/10057] Split statements in firebird dbal for readability.
  [ticket/10057] Include error collector class file in postgres dbal.
  [ticket/10057] Moved error collector class into its own file.
  [ticket/10057] Use a class for error collection.
  [ticket/10057] More informative error messages in postgres dbal.
  [ticket/10057] No negative array indexing.
  [ticket/10057] Report postgres db connection errors.
2011-03-10 05:25:36 -05:00
Oleg Pudeyev
aa8f4000d3 Merge branch 'ticket/rxu/10035' into develop-olympus
* ticket/rxu/10035:
  [ticket/10035] ACP template edit feature allows to read any files on webserver.
2011-03-10 05:22:37 -05:00
Oleg Pudeyev
87e3560c30 [ticket/10057] Fixes for a bunch of small problems.
PHPBB3-10057
2011-03-08 19:48:56 -05:00
Andreas Fischer
e00a868ce3 Merge branch 'ticket/igorw/9669' into develop
* ticket/igorw/9669:
  [ticket/9669] Replace spaces with tabs
  [ticket/9669] Switch if/else to make the if positive
  [ticket/9669] Make sure normalize_nfc returns string
  [ticket/9669] Add isNormalized checks for performance
  [ticket/9669] Add native Normalizer support
2011-03-07 21:56:24 +01:00
Nils Adermann
458b8841eb [ticket/10080] Allow resetting the request instance used by request_var.
PHPBB3-10080
2011-03-07 18:54:52 +01:00
Josh Woody
f6c6de4539 [ticket/9946] Allow storage of data >4kB on Oracle again
This fixes the fix to PHPBB3-9132, which introduced a fatal error on Oracle.

PHPBB3-9946
2011-03-07 10:31:25 -06:00
rxu
9a9b156a8e [ticket/10035] ACP template edit feature allows to read any files on webserver.
... and to upload/execute any script on it. Use preg_replace to filter filename

PHPBB3-10035
2011-03-07 21:22:33 +07:00
Oleg Pudeyev
020d06cdaa [ticket/10057] Handle the case of missing interbase extension better.
PHPBB3-10057
2011-03-07 09:09:40 -05:00
Oleg Pudeyev
7acbf98692 [ticket/10057] Fixed wrong usage of sql_error again, in firebird.
This necessitates adding connect_error property to firebird.

PHPBB3-10057
2011-03-07 09:04:01 -05:00
Oleg Pudeyev
e5aa2c9ac1 [ticket/10057] Fixed usage of sql_error again.
PHPBB3-10057
2011-03-07 08:52:59 -05:00
Oleg Pudeyev
40468a5adc [ticket/10057] Condition file/line display on DEBUG_EXTRA or IN_INSTALL.
PHPBB3-10057
2011-03-07 08:46:49 -05:00
Igor Wiedler
90cc061fc0 [ticket/9669] Replace spaces with tabs
PHPBB3-9669
2011-03-07 09:49:58 +01:00
Oleg Pudeyev
98388b2921 [ticket/10057] Fixed wrong usage of sql_error in postgres dbal.
pg_last_error does not work if no connection was ever established.
Therefore we must keep track of connection errors in postgres
dbal ourselves.

PHPBB3-10057
2011-03-06 23:17:01 -05:00
Oleg Pudeyev
edc1deaa3a [ticket/10057] Skip ibase_service_attach if firebird connection failed.
ibase_errmsg works for the most recent call. If the connection
fails, any error message is clobbered by ibase_service_attach call.

PHPBB3-10057
2011-03-06 23:13:19 -05:00
Oleg Pudeyev
4d92f9bb2e [ticket/10057] Check for interbase function existence.
Calling nonexistent functions with @ destroys the script with
no feedback as to the cause of the error. Check whether
interbase functions exist before calling them.

PHPBB3-10057
2011-03-06 23:10:09 -05:00
Oleg Pudeyev
af43ed655b [ticket/10057] Split statements in firebird dbal for readability.
PHPBB3-10057
2011-03-06 23:10:09 -05:00
Oleg Pudeyev
22004fa7d6 [ticket/10057] Include error collector class file in postgres dbal.
This change is in its own commit because it will be reverted for 3.1.

PHPBB3-10057
2011-03-06 20:51:09 -05:00
Oleg Pudeyev
24834543ee [ticket/10057] Moved error collector class into its own file.
This will make it autoloadable in 3.1. This commit breaks 3.0
since no code includes the error collector. Such include code
will be in its own commit since it will need to be reverted in 3.1.

PHPBB3-10057
2011-03-06 20:16:17 -05:00
Oleg Pudeyev
17693c2802 [ticket/10057] Use a class for error collection.
Replaced error collection functions with a class for a cleaner
implementation.

PHPBB3-10057
2011-03-06 20:16:17 -05:00
Oleg Pudeyev
a4100fe709 [ticket/10057] More informative error messages in postgres dbal.
When pg_connect/pg_pconnect do not exist, mention that they come
with pgsql extension.

PHPBB3-10057
2011-03-06 20:16:17 -05:00
Oleg Pudeyev
fc5be6928f [ticket/10057] No negative array indexing.
PHP manual does not say that negative array indices are allowed,
so it's best to assume they are not guaranteed to work the way
one would expect.

PHPBB3-10057
2011-03-06 20:16:17 -05:00
Oleg Pudeyev
d69a7c620a [ticket/10057] Report postgres db connection errors.
Addresses two issues:

1. When pgsql extension is missing, @pg_connect would silently
abort execution. Check for pg_connect existence before calling it,
same with pg_pconnect.

2. When connection fails, the error reported by php is discarded.
User is shown the failure message without the reason for failure,
making debugging difficult. Collect the error (if any) via a
temporarily installed error handler, and display it if connection
failed.

PHPBB3-10057
2011-03-06 20:16:16 -05:00
Andreas Fischer
ac90190682 [ticket/9970] Rename validate_language() to validate_language_iso_name().
PHPBB3-9970
2011-03-07 00:41:24 +01:00
Andreas Fischer
0f16fd3519 [ticket/9970] Do not allow switching to languages not installed on reg. page.
PHPBB3-9970
2011-03-07 00:41:24 +01:00
Andreas Fischer
405ef39828 [ticket/9970] Check whether language pack is installed.
PHPBB3-9970
2011-03-07 00:41:24 +01:00
Josh Woody
f7723b3e95 [ticket/9970] User language input is checked for existance
Users could select a language which did not exist in the database by altering
form fields because there was no back-end verification.

PHPBB3-9970
2011-03-07 00:41:14 +01:00
Igor Wiedler
6681b2417a [ticket/9669] Switch if/else to make the if positive
PHPBB3-9669
2011-03-06 21:39:42 +01:00
Andreas Fischer
9cdeb51a52 [ticket/10016] Add comment for text casting (for PostgreSQL 7.x)
PHPBB3-10016
2011-03-05 22:55:58 +01:00
Andreas Fischer
841061426d [ticket/10016] Leave Firebird unchanged.
PHPBB3-10016
2011-03-05 22:48:24 +01:00