1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-10 09:35:24 +02:00

306 Commits

Author SHA1 Message Date
Igor Wiedler
a40bc114c0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10112] Replaced a couple occurrences of count() with sizeof()
2011-03-31 20:32:11 +02:00
Igor Wiedler
564ce6c7f6 Merge remote branch 'callumacrae/ticket/10112' into develop-olympus
* callumacrae/ticket/10112:
  [ticket/10112] Replaced a couple occurrences of count() with sizeof()
2011-03-31 20:31:58 +02:00
Callum Macrae
657971754b [ticket/10112] Replaced a couple occurrences of count() with sizeof()
As per the coding guidlines, sizeof() should be used instead of count().

PHPBB3-10112
2011-03-30 11:30:27 +01:00
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
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
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
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
87e3560c30 [ticket/10057] Fixes for a bunch of small problems.
PHPBB3-10057
2011-03-08 19:48:56 -05: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
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
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
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
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
Nils Adermann
cde423591e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9859] Remove the years from the copyright statements in docs files.
  [ticket/9859] Remove the year from the copyright meta tag in docs/*.html
  [ticket/9859] Remove the meta copyright tag as well.
  [ticket/9859] Remove the credit line comment from all html files.
  [ticket/9859] Remove years in credit line from some more files.
2011-01-16 22:26:27 +01:00
Andreas Fischer
2a703b4055 [ticket/9859] Remove years in credit line from some more files.
Standard HTML output now includes:
Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group

Print output now includes:
Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/

This also fixes an inconsistency where "phpBB Group" was linked instead of
"phpBB".

PHPBB3-9859
2011-01-16 17:53:30 +01:00
Nils Adermann
fb2642bbc6 [task/config-class] Implemented a config class to replace the global array.
There is a phpbb_config class which simply holds an array and does not persist
any data. It implements ArrayAccess, Countable and IteratorAggregate to allow
regular use of configuration as if it was still an array. The phpbb_config_db
class depends on an instance of the dbal and a cache driver. It obtains the
configuration data from cache and database as necessary and persists data to
the database.

The functions set_config and set_config_count remain for backward compatability
but they only call methods on the new config class now instead of directly
manipulating the database and cache.

PHPBB3-9988
2011-01-10 04:05:23 +01:00
Igor Wiedler
eda9fbbb63 [ticket/9574] Remove conditional PHP<5.2 code
There is a large amount of conditional code for PHP < 5.2 that can be
removed with phpBB 3.1.

PHPBB3-9574
2010-12-28 22:36:25 +01:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
Andreas Fischer
f164906d77 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.
  [task/mssql-db-tests] Split up database tests into SELECT and write operations
  [task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start.
  [task/mssql-db-tests] sql_query_limit must return all results when total = 0
  [task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connections
  [task/mssql-db-tests] Refactored getConnection into multiple smaller parts.
  [task/mssql-db-tests] Allow test configuration with environment variables.
  [task/mssql-db-tests] No longer display an error when skipping db tests.
  [task/mssql-db-tests] Use a simple getter for test case helpers.

Conflicts:
	tests/template/template.php
2010-11-03 11:58:48 +01:00
Andreas Fischer
e3b460a518 Merge branch 'task/naderman/mssql-db-tests' into develop-olympus
* task/naderman/mssql-db-tests:
  [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.
  [task/mssql-db-tests] Split up database tests into SELECT and write operations
  [task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start.
  [task/mssql-db-tests] sql_query_limit must return all results when total = 0
  [task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connections
  [task/mssql-db-tests] Refactored getConnection into multiple smaller parts.
  [task/mssql-db-tests] Allow test configuration with environment variables.
  [task/mssql-db-tests] No longer display an error when skipping db tests.
  [task/mssql-db-tests] Use a simple getter for test case helpers.
2010-11-03 11:32:13 +01:00
Igor Wiedler
265da3455d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9478] Validate maximum number of allowed recipients per PM value.
  [ticket/9686] Fix mssqlnative database data export
  [ticket/9595] List min/max characters indexed by search for mysql_fulltext.
  [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN.
  [ticket/9853] Change recaptcha theme from default to 'clean'.
2010-10-25 22:08:51 +02:00
Nils Adermann
76e8a9466e [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.
PHPBB3-9868
2010-10-25 19:43:39 +02:00
Nils Adermann
ee0993a8a6 [task/mssql-db-tests] sql_query_limit must return all results when total = 0
PHPBB3-9868
2010-10-25 19:43:39 +02:00
Nils Adermann
5c5b0fc4be [ticket/9686] Fix mssqlnative database data export
We require version 1.1 of the sqlsrv extension anyway so the regular
sqlsrv_num_rows can be used instead of buffering the result. The result
buffer (class result_mssqlnative) should never automatically free the
resource it receives - we consistently close resources using sql_freeresult().

PHPBB3-9686
2010-10-25 03:33:37 +02:00
Igor Wiedler
2092a8aaca [feature/request-class] Check for existence of $request
PHPBB3-9716
2010-10-12 16:14:01 +02:00
Igor Wiedler
fccd7f0ab5 [feature/request-class] Convert any direct access to $_* to use $request
PHPBB3-9716
2010-09-25 20:32:15 +02:00
Chris Smith
1b3b79b694 Merge branch 'ticket/evil3/8944' into develop-olympus
* ticket/evil3/8944:
  [ticket/8944] Patch db_tools to support index length for MySQL4
  [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
2010-09-05 02:41:34 +01:00
Igor Wiedler
e7b86871f0 [ticket/8944] Patch db_tools to support index length for MySQL4 2010-09-05 03:14:27 +02:00
Igor Wiedler
58bdd91d61 [ticket/9039] Make mssqlnative.php non-executable
PHPBB3-9039
2010-09-03 22:43:29 +02:00
Andreas Fischer
ccb4182d29 Merge branch 'ticket/kellanved/9521' into develop-olympus
* ticket/kellanved/9521:
  [ticket/9521] Fix error reporting for the native SQL Server plugin.
2010-07-31 02:08:40 +02:00
Henry Sudhof
47557fd4d2 [ticket/9521] Fix error reporting for the native SQL Server plugin.
The native SQL Server plugin used to return an error string when calling
sql_error. However, some error condition checks are done using is_array.
This patch wraps the error into an array to follow the error logic used
elsewhere.

PHPBB3-9521
2010-07-31 01:48:13 +02:00
Andreas Fischer
2d9aa45aef Merge branch 'ticket/jellydoughnut/9637' into develop-olympus
* ticket/jellydoughnut/9637:
  [ticket/9637] Do not cache SQL server version in all cases
2010-07-11 01:44:59 +02:00
Josh Woody
9c61455d26 [ticket/9637] Do not cache SQL server version in all cases
Because the existing cache is global, there is no way to differentiate between
each of two databases which may be two different DBAL objects pointing to
servers with wildly different versions of an RDBMS. phpBB only has this
situation in the UCF, thus only one file changed outside the DBAL. I have
added a second optional parameter, $use_cache to each of the implementations
of dbal::sql_server_info()

PHPBB3-9637
2010-07-11 01:41:38 +02:00
Andreas Fischer
3496948b94 Merge branch 'ticket/bantu/9643' into develop-olympus
* ticket/bantu/9643:
  [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.
2010-06-20 22:45:28 +02:00
Josh Woody
e942af5331 [ticket/9132] Oracle CLOB support is broken, preventing storage of long strings
This reverts Oracle support to the state it was in prior to phpBB 3.0.6.  That is, storage of long strings works again (e.g. posts > 4 KB), but the database backup/restore functionality is broken.  We feel that the ability to store long strings is more important than the DB restore, since Oracle 10g itself provides tools for backing up databases.

PHPBB3-9132
2010-06-13 19:18:35 -05:00
Andreas Fischer
879bc89524 [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.
PHPBB3-9643
2010-06-08 19:27:55 +02:00
Andreas Fischer
970848409d [ticket/9518] Correctly create new connection on PostgreSQL when new connection is forced.
pg_connect() takes an integer as the second parameter, but we were passing a boolean parameter. The function especially requires passing the PGSQL_CONNECT_FORCE_NEW constant if a new connection is to be forced. Passing 0 as the second parameter for 'do not force a new connection' doesn't work as expected, hence we're calling the function without a second parameter in this case.

PHPBB3-9518
2010-05-14 02:22:24 +02:00
Andreas Fischer
c6e176d88e Add sql_bit_or() dbal method. Add ability to enable quick reply in all forums. -- Voila ;-)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10491 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-15 15:04:44 +00:00
Nils Adermann
7332b3b741 Forgot to properly update the file header of mssqlnative.php, revising r10489 [Bug #57055]
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10490 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-11 00:05:32 +00:00
Nils Adermann
1802b9ff92 Support for Microsoft's Native SQL Server Driver for PHP - Patch by Chris Pucci at Microsoft [Bug #57055]
If you are using SQL Server, please try to test this new dbal so we can safely include it in 3.0.8. If you
want to try it on a current phpBB version you can apply the latest version of the patch to your board which
you can find attached to the bug tracker ticket (look in the comments for the latest version, the one in the
ticket itself is outdated): http://www.phpbb.com/bugs/phpbb3/ticket.php?ticket_id=57055



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10489 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-11 00:02:51 +00:00
Nils Adermann
870921c872 Database updater now separates ADD COLUMN from SET NOT NULL and SET DEFAULT, when using PostgreSQL <= 7.4 [Bug #54435]
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10446 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 02:06:37 +00:00
Andreas Fischer
409dfe5256 Fix Bug #55785 - Correct call to mysql_pconnect().
Note: As pointed out by gn#36, phpBB doesn't use persistent connections at all.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10375 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-23 15:07:52 +00:00