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

1486 Commits

Author SHA1 Message Date
Nils Adermann
984fd07319 [ticket/10247] Add empty data section to database update for RC4
PHPBB3-10247
2011-07-03 02:29:51 -04:00
Nils Adermann
cf4b639be5 [ticket/10247] Remove unecessary attempt_id primary key column
The database update drops any key of the same name (potential primary key) and
afterwards the column. This does not work on some of the supported DBMS and
needs further changes.

PHPBB3-10247
2011-07-03 02:15:40 -04:00
Andreas Fischer
ffa6f3448f [prep-release-3.0.9] Bump database version to RC3 too. 2011-06-26 21:50:02 +02:00
Andreas Fischer
fe0932fdf0 [prep-release-3.0.9] Bumping version number for 3.0.9-RC3. 2011-06-26 20:47:33 +02:00
Andreas Fischer
cc7c5d54ad Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10223] Make definition of phpbb_require_updated conditional
2011-06-20 00:28:42 +02:00
Andreas Fischer
e0ecd3e118 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10223] Make definition of phpbb_require_updated conditional
2011-06-20 00:28:35 +02:00
Nils Adermann
ad5ed9d0ee [ticket/10223] Make definition of phpbb_require_updated conditional
The automatic updater defines it too and includes database_update.php
for updating which causes an error otherwise.

PHPBB3-10223
2011-06-20 00:00:30 +02:00
Andreas Fischer
fc6cdc7eec Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10223] Replace spaces with tabs
2011-06-19 23:12:45 +02:00
Andreas Fischer
1320bb7bf8 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10223] Replace spaces with tabs
2011-06-19 23:12:21 +02:00
Nils Adermann
67fde80fbb [ticket/10223] Replace spaces with tabs
PHPBB3-10223
2011-06-19 23:02:59 +02:00
Andreas Fischer
93dba4b023 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10223] The search fid parameter is an array of forums not just an id
  [ticket/10223] Check optional before file_exists and correct require path
  [ticket/10223] requiring the new startup.php file conditionally.
2011-06-19 17:57:42 +02:00
Andreas Fischer
4e85731a5f Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10223] The search fid parameter is an array of forums not just an id
  [ticket/10223] Check optional before file_exists and correct require path
  [ticket/10223] requiring the new startup.php file conditionally.
2011-06-19 17:57:29 +02:00
Nils Adermann
d3f1b60292 [ticket/10223] Check optional before file_exists and correct require path
PHPBB3-10223
2011-06-18 23:48:37 +02:00
Nils Adermann
1b0821a11b [ticket/10223] requiring the new startup.php file conditionally.
Added a function for this which we can potentially apply to more of the files in the
installer and database updater.

PHPBB3-10223
2011-06-18 01:02:58 +02:00
Andreas Fischer
48e5e56146 [prep-release-3.0.9] Bumping version number for 3.0.9-RC2. 2011-06-15 19:41:14 +02:00
Andreas Fischer
835faff61a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10218] Prevent startime from being overwritten by deregister_globals()
  [ticket/10218] Moving global deregistration, etc. to startup.php

Conflicts:
	phpBB/install/database_update.php
2011-06-15 18:51:45 +02:00
Andreas Fischer
79f757d4b7 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10218] Prevent startime from being overwritten by deregister_globals()
  [ticket/10218] Moving global deregistration, etc. to startup.php

Conflicts:
	phpBB/install/database_update.php
2011-06-15 18:51:04 +02:00
Yuriy Rusko
f8eb154714 [ticket/10218] Moving global deregistration, etc. to startup.php
Because startup.php deletes all variables, the constants in
database_update are used to preserve settings at the top.

PHPBB3-10218
2011-06-14 06:11:35 -04:00
Andreas Fischer
bf61602a28 [develop-olympus] Incrementing the version to 3.0.10-dev in develop-olympus. 2011-06-13 22:23:28 +02:00
Andreas Fischer
8a54aa5d68 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10214] Correct Oracle create table query syntax in db_tools
2011-06-13 19:50:06 +02:00
Nils Adermann
c090e1c9e9 [ticket/10214] Correct Oracle create table query syntax in db_tools
Removes the semicolon at end of oracle CREATE TABLE queries and adds a
semicolon to the end of a SELECT query inside of the trigger for a new
table's auto increment column before the end keyword

PHPBB3-10214
2011-06-13 06:14:59 +02:00
Andreas Fischer
5c010250ee Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10213] Update install schema with shorter index names.
2011-06-13 02:20:35 +02:00
Nils Adermann
47edadfc9e [ticket/10213] Update install schema with shorter index names.
PHPBB3-10213
2011-06-13 01:52:18 +02:00
Andreas Fischer
ddea203492 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9892] _sql in the updater needs to return the transaction results
2011-06-13 00:09:46 +02:00
Andreas Fischer
25bd58d2f9 Merge remote-tracking branch 'naderman/ticket/9892' into develop-olympus
* naderman/ticket/9892:
  [ticket/9892] _sql in the updater needs to return the transaction results
2011-06-13 00:09:37 +02:00
Nils Adermann
c9e22ac509 [ticket/9892] _sql in the updater needs to return the transaction results
PHPBB3-9892
2011-06-12 23:45:23 +02:00
Andreas Fischer
8453587264 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9992] The table name constant needs to be defined in the updater
2011-06-12 23:19:46 +02:00
Andreas Fischer
d724c3afac Merge remote-tracking branch 'naderman/ticket/9992' into develop-olympus
* naderman/ticket/9992:
  [ticket/9992] The table name constant needs to be defined in the updater
2011-06-12 23:19:37 +02:00
Nils Adermann
b65cf4c8d6 [ticket/9992] The table name constant needs to be defined in the updater
When the database update is run before updating the files the constant
is not yet defined.

PHPBB3-9992
2011-06-12 23:09:52 +02:00
Andreas Fischer
7232ca4102 [develop-olympus] Bumping version number for 3.0.9-RC1. 2011-06-12 19:45:01 +02:00
Andreas Fischer
b774520621 [develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 releases. 2011-06-12 19:45:01 +02:00
Andreas Fischer
9b469eb163 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9892] Correct copyright year
  [ticket/9892] Remove incorrect use of camel case
  [ticket/9892] Removing closing php tag from create_schema_files
  [ticket/9892] Transaction support for database update sql execution function
  [ticket/9892] count is a keyword in firebird, so renaming this alias
  [ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to change config
  [ticket/9892] Shorten login_attempt key names to avoid firebird length problems
  [ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent state
  [ticket/9892] Adding a number of tests for db_tools
  [ticket/9892] Table prefix lengths influence index lengths in db_tools
  [ticket/9892] Shorten the index names on the q&a captcha
  [ticket/9892] column & index name limits, firebird auto increment in db_tools

Conflicts:
	phpBB/develop/create_schema_files.php
2011-06-12 19:27:01 +02:00
Nils Adermann
2569d7460a [ticket/9892] Transaction support for database update sql execution function
Updates would fail before because 'begin' as generated by
db_tools::sql_create_table would be executed literally.

PHPBB3-9892
2011-06-12 11:40:57 +02:00
Nils Adermann
cd3d23810f [ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to change config
PHPBB3-9892
2011-06-12 11:10:18 +02:00
Nils Adermann
6cab45b28e [ticket/9892] Shorten login_attempt key names to avoid firebird length problems
PHPBB3-9892
2011-06-12 11:02:30 +02:00
Nils Adermann
32f37bf938 [ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent state
PHPBB3-9892
2011-06-12 11:02:21 +02:00
Nils Adermann
ef544ee095 [ticket/9892] Table prefix lengths influence index lengths in db_tools
PHPBB3-9892
2011-06-12 04:10:51 +02:00
Nils Adermann
418c3d546a [ticket/9892] column & index name limits, firebird auto increment in db_tools
- Column names are limited to 30 characters
- Index names are limited to 31 characters.
  On some dbms the index name contains both table name and actual index name
  so the limit applies to the sum of the lenghts of table name and index name.
- Auto incremented column names are limited to 26 characters to provide an
  additional 4 characters for sequence names

The code for firebird auto increment support using generators/sequences with
triggers was copied from create_schema_files.php

PHPBB3-9892
2011-06-12 01:28:01 +02:00
Andreas Fischer
fe5d616349 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9992] Clarify explanations of ip and account limits on login
  [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN
  [ticket/9992] Use sql_fetchfield for single row and single column result
  [ticket/9992] Adding a limit on login attempts per IP.
  [ticket/9992] Make sql_create_table and sql_table_exists available in updater
2011-06-11 19:42:04 +02:00
Nils Adermann
2dee57fd43 [ticket/9992] Adding a limit on login attempts per IP.
A new table was created to save all failed login attempts with
corresponding information on username, ip and useragent. By default
the limit is 50 login attempts within 6 hours per IP. The limit is
relatively high to avoid big problems on sites behind a reverse
proxy that don't receive the forwarded-for value as REMOTE_ADDR but
see all users as coming from the same IP address. But if these
users run into problems a special forwarded-for option is available
to limit logins by forwarded-for value instead of ip.

PHPBB3-9992
2011-06-10 12:18:19 +02:00
Nils Adermann
fc9b126691 [ticket/9992] Make sql_create_table and sql_table_exists available in updater
These are defined the same way in db_tools. This duplicated code should be
removed together with the rest of the db_tools duplication at some point.

PHPBB3-9992
2011-06-10 11:06:29 +02:00
Nils Adermann
ed95c7195f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10039] Added mssqlnative cases to phpBB 2.0 converter.
2011-06-02 04:53:48 +02: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
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
cc0e6e9912 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.
2011-05-10 23:46:24 -04:00
Andreas Fischer
5a4a1e3c25 [ticket/10126] Use binary "and not" instead of binary "xor" in error_reporting.
Make what we want to achieve clear by using "and not" instead of "xor".

PHPBB3-10126
2011-05-11 03:56:15 +02:00
Oleg Pudeyev
87832d06cc [feature/template-engine] Delete template class, use phpbb_template instead.
PHPBB3-9726
2011-05-04 00:08:20 -04:00
Oleg Pudeyev
c033698815 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9954] Remove unneeded never permission
2011-05-03 00:51:10 -04:00
Oleg Pudeyev
3a70cb478c Merge remote-tracking branch 'erikfrerejean/ticket/9954' into develop-olympus
* erikfrerejean/ticket/9954:
  [ticket/9954] Remove unneeded never permission
2011-05-03 00:24:44 -04:00