Commit graph

12113 commits

Author SHA1 Message Date
Igor Wiedler
03017a8946 [ticket/10107] Make it clear that provided httpd samples are not perfect
PHPBB3-10107
2011-03-24 00:35:05 +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
Igor Wiedler
ae8131077e [ticket/10107] Add a webserver section to docs/INSTALL.html
Explain what to do with lighttpd and nginx after installing phpBB on
one of those webservers.

PHPBB3-10107
2011-03-23 23:13:52 +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
634392aa1b [ticket/10021] Adjust ticket/10021 for develop
Ascraeus is PHP5.2+, so we no longer need to check for -1.

PHPBB3-10021
2011-03-20 23:09:24 +01:00
Igor Wiedler
ce92724514 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10021] Add comment explaining why we can check -1 as an error value.
  [ticket/10021] Check whether gmmktime() returns false before putting it in SQL.
2011-03-20 23:06:23 +01:00
Igor Wiedler
51fb493edc Merge remote branch 'bantu/ticket/10021' into develop-olympus
* bantu/ticket/10021:
  [ticket/10021] Add comment explaining why we can check -1 as an error value.
  [ticket/10021] Check whether gmmktime() returns false before putting it in SQL.
2011-03-20 23:06:10 +01:00
Igor Wiedler
30daee12f9 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10102] Correct member.S_PENDING_SET to S_PENDING_SET in if statement.
2011-03-20 22:42:51 +01:00
Andreas Fischer
087e7642e7 [ticket/10102] Correct member.S_PENDING_SET to S_PENDING_SET in if statement.
There is no member.S_PENDING_SET variable.

This fixes an XHTML error when managing groups with both approved and pending
users from the UCP.

PHPBB3-10102
2011-03-19 14:56:56 +01:00
Andreas Fischer
c24408f6ed [ticket/10021] Add comment explaining why we can check -1 as an error value.
PHPBB3-10021
2011-03-18 02:51:43 +01: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
Oleg Pudeyev
089e3a9ff4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
  [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
2011-03-12 23:33:55 -05:00
Oleg Pudeyev
4d231112b6 Merge branch 'ticket/bantu/8802' into develop-olympus
* ticket/bantu/8802:
  [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
  [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
2011-03-12 23:32:43 -05:00
Oleg Pudeyev
8053be52e0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9948] Inline quicktime files won't show
2011-03-12 19:14:04 -05:00
Oleg Pudeyev
3dd5c95b6c Merge branch 'ticket/erikfrerejean/9948' into develop-olympus
* ticket/erikfrerejean/9948:
  [ticket/9948] Inline quicktime files won't show
2011-03-12 19:13:55 -05: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
Andreas Fischer
a8f2e79fbc [ticket/10046] No longer change $phpbb_root_path to an absolute path for cron.
This is no longer required because we no longer call
register_shutdown_function() which made this change necessary.

PHPBB3-10046
2011-03-12 14:57:26 +01:00
Andreas Fischer
79d209824f [ticket/10046] Call flush() in cron.php
PHPBB3-10046
2011-03-12 14:56:47 +01:00
Andreas Fischer
ec15ac92f3 [ticket/10046] Remove calls to register_shutdown_function() in cron.php
After reading some PHP source as well as the PHP manual we have arrived at the
following two situations with one conclusion:

 * SAPI supports flush():
   o call to flush() is enough to stop the page from displaying as loading
   o and thus register_shutdown_function is unnecessary

 * SAPI does not support flush():
   o neither a call to flush() nor the beginning of shutdown phase, which calls
     registered shutdown functions can flush anything to the client
   o and thus register_shutdown_function is unnecessary

Thanks to lacton for reporting the initial issue.
Thanks to nn- and naderman for doing all the dirty works.

PHPBB3-10046
2011-03-12 14:56:46 +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
Andreas Fischer
67fa589ba2 [ticket/8802] Make FORUMS_MARKED more generic as it is also used for subforums.
PHPBB3-8802
2011-03-10 16:47:00 +01:00
Andreas Fischer
dfbd8f7de9 [ticket/8802] Rename "Mark forums read" to "Mark subforums read" for subforums.
Clicking "Mark forums read" when not browsing on the index page only marks
all subforums (and sub-sub forums etc.) read, topics in the current forum have
to marked seperately by clicking the "Mark topics read" link.

Let's indicate this circumstance by using the word "subforums".

PHPBB3-8802
2011-03-10 16:28:46 +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
Andreas Fischer
c78637da1a Merge branch 'ticket/p/10057' into develop-olympus
* ticket/p/10057:
  [ticket/10057] Fixes for a bunch of small problems.
  [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-09 19:46:03 +01: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
062c951d33 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10079] Add gallery avatars to .gitignore.
  [ticket/10069] Improvements to sample nginx configuration.
2011-03-07 22:01:37 +01: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
Andreas Fischer
65580f7901 [ticket/10021] Check whether gmmktime() returns false before putting it in SQL.
This prevents SQL errors when large dates are entered.

PHPBB3-10021
2011-03-07 13:41:24 +01:00