1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 03:29:23 +02:00

239 Commits

Author SHA1 Message Date
Stanislav Atanasov
1043d1a27c [ticket/12846] SQLite3 bug in profilefield_base_migration.php
Using profilefield_base_migration.php to create a custom profile
field with SQlite3 DBMS returns warning:

[phpBB Debug] PHP Warning: in file [ROOT]/phpbb/db/driver/sqlite3.php
on line 218: SQLite3Result::fetchArray(): Unable to execute statement:
constraint failed

This is due passing filed_id and lang_id to the DB driver in
unspecified format. As they are always int we should cast them
in int to prevent the error message appearance.

PHPBB3-12846
2014-07-13 01:45:20 +03:00
Joas Schilling
4449793b07 [prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2 2014-07-11 16:04:27 +02:00
Joas Schilling
d5fd1ecfc8 Merge pull request #2675 from lucifer4o/ticket/12786
[ticket/12786] Extend profilefield_base_migration.php class

* lucifer4o/ticket/12786:
  [ticket/12786] Correcting some tabs
  [ticket/12786] Array_merge instead copy array parts
  [ticket/12786] Some changes of the comments.
  [ticket/12786] Dixing a typo
  [ticket/12786] Some minor fixes of comments and function naming
  [ticket/12786] Add clean_cpf_db_entries
  [ticket/12786] White spaces found
  [ticket/12786] Add create_language_entries
  [ticket/12786] Add get_custom_field_id
  [ticket/12786] Extend profilefield_base_migration.php class
2014-07-09 17:00:43 +02:00
Stanislav Atanasov
c468a5d8d4 [ticket/12786] Correcting some tabs
Some tabs needed corection

PHPBB3-12786
2014-07-08 22:01:49 +03:00
Matt Friedman
606d82f7dd [ticket/12812] Add a migrator tool for config_text database changes
PHPBB3-12812
2014-07-05 00:57:34 -07:00
Nils Adermann
53ff23671c Merge remote-tracking branch 'github-nicofuma/ticket/12446' into develop-ascraeus
* github-nicofuma/ticket/12446:
  [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
2014-07-04 21:08:20 +02:00
Stanislav Atanasov
4cec5bcd55 [ticket/12786] Array_merge instead copy array parts
nickvergessen proposed this

PHPBB3-12786
2014-07-04 14:49:23 +03:00
Stanislav Atanasov
c9da9ec858 [ticket/12786] Some changes of the comments.
Comments and quotes

PHPBB3-12786

[ticket/12786]

PHPBB3-12786

Revert "[ticket/12786]"

This reverts commit 61a6647101731110f67689b109de953f7449b03e.
2014-07-03 20:18:51 +03:00
Stanislav Atanasov
41047bc369 [ticket/12786] Dixing a typo
Typos fixed

PHPBB3-12786
2014-06-29 22:46:45 +03:00
Stanislav Atanasov
ffbd7cf1a7 [ticket/12786] Some minor fixes of comments and function naming
PHPBB3-12786
2014-06-29 22:38:05 +03:00
Stanislav Atanasov
18631801d5 [ticket/12786] Add clean_cpf_db_entries
Add function to clean the cpf fields entries

PHPBB3-12786
2014-06-29 16:29:09 +03:00
Stanislav Atanasov
52204e0e6d [ticket/12786] White spaces found
Removed some white spaces

PHPBB3-12786
2014-06-29 12:21:40 +03:00
Stanislav Atanasov
e3b07274ef [ticket/12786] Add create_language_entries
Add function to create entries in PROFILE_FIELDS_LANG_TABLE

PHPBB3-12786
2014-06-29 11:51:47 +03:00
Stanislav Atanasov
b70a1cc4af [ticket/12786] Add get_custom_field_id
Adding function to get CPFs ID

PHPBB3-12786
2014-06-29 11:50:40 +03:00
Stanislav Atanasov
564924e876 [ticket/12786] Extend profilefield_base_migration.php class
If extensions authors will use profilefield_base_migration.php
class as base class for creation of CPFs, the class need to be
extended a bit.

At the moment there are two issues with it:

It does not create entries for PROFILE_FIELDS_LANG_TABLE
(as it can't know what fields to create).

The migration is not "cleaning" the DBMS after purging
the extension and leaves everything except the CPF column.

Adding profilefield_language_data

PHPBB3-12786
2014-06-29 11:48:06 +03:00
Tristan Darricau
ff6e026a40 [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
PHPBB3-12446
2014-06-26 21:09:19 +02:00
Stanislav Atanasov
deb393bff3 [ticket/12771] Shanging substr to strpos
Logical change ...

PHPBB3-12771
2014-06-26 20:56:00 +03:00
Stanislav Atanasov
c14db9ccd0 [ticket/12771] Change var name
Change var name

PHPBB3-12771
2014-06-26 14:19:49 +03:00
Stanislav Atanasov
5a76b36dfb [ticket/12771] Bug in profilefield_base_migration when used in ext
The base migration class should create lang entry for the new CPF
but it is supposed to strip it of phpbb_ prefix. As extensions
CPFs do not use phpbb_ prefix it will not create a lang entry.
This is as simple solution as it can be done.

PHPBB3-12771
2014-06-26 13:18:27 +03:00
Joas Schilling
6a9baaab0b [prep-release-3.1.0-RC1] Add migration for 3.1.0-RC1 2014-06-24 23:21:48 +02:00
Joas Schilling
7afc13b4db Merge pull request #2615 from Dragooon/ticket/12730
[ticket/12730] Add Google+ profile field

* Dragooon/ticket/12730:
  [ticket/12730] Update Google+ button class to use proper identification
  [ticket/12730] Update maxlen for type_googleplus to 255
  [ticket/12730] Fix type_googleplus_test to use same validation rule as the field
  [ticket/12730] Update field_length to be 20 by default for Google+
  [ticket/12730] Google+ field_order should be 13
  [ticket/12730] Switch service name to googleplus for type_googleplus
  [ticket/12730] Restore field_length to 10 for type_googleplus
  [ticket/12730] Add functional test for Google+ field
  [ticket/12730] Value shouldn't be escaped for schema_data.sql
  [ticket/12730] Missing newline at type_googleplus_test.php
  [ticket/12730] Set field_active to 1 for Google+ field
  [ticket/12730] Add unit test for type_googleplus
  [ticket/12730] Add missing brackets to type_googleplus.php
  [ticket/12730] Update field_order for Google+ CPF
  [ticket/12730] Use string template for Google+ CPF instead of a new one
  [ticket/12730] Minor formatting fixes
  [ticket/12730] Incorrect indentation for type_googleplus
  [ticket/12730] Spaces in block header
  [ticket/12730] Add a Google+ field by default
  [ticket/12730] Add Google+ profile field type
2014-06-22 19:40:56 +02:00
Andreas Fischer
afe9d3c3f3 Merge pull request #2630 from Nicofuma/ticket/12723
[ticket/12723] Add Sniff ensuring PHP files use the correct file header

* Nicofuma/ticket/12723:
  [ticket/12723] Do not mention too many details on documentation.
  [ticket/12723] Do not reference the coding guidelines section.
  [ticket/12757] Add a Code Sniffer ruleset for PHP files of phpBB extensions
  [ticket/12723] Properly describe new Code Sniffer rulsets.
  [ticket/12723] Use core suffix in filename instead of phpbb in the middle.
  [ticket/12723] Add Sniff ensuring PHP files use the correct file header
2014-06-22 11:35:13 +02:00
Tristan Darricau
32a2c95f90 [ticket/12723] Add Sniff ensuring PHP files use the correct file header
PHPBB3-12723
2014-06-22 00:45:34 +02:00
Shitiz Garg
e51a5791dd [ticket/12730] Update maxlen for type_googleplus to 255
PHPBB3-12730
2014-06-21 03:51:08 +05:30
Shitiz Garg
e1454ec487 [ticket/12730] Minor formatting fixes
PHPBB3-12730
2014-06-21 03:31:23 +05:30
Shitiz Garg
ab83995f44 [ticket/12730] Add a Google+ field by default
PHPBB3-12730
2014-06-21 03:31:23 +05:30
Joas Schilling
18bf45ab1b Merge pull request #2628 from Dragooon/ticket/12731
[ticket/12731] Add YouTube custom profile field

* Dragooon/ticket/12731:
  [ticket/12731] Add functional test for youtube field
  [ticket/12731] Set field_active to 1 for YouTube field
  [ticket/12731] Add YouTube custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
2014-06-20 23:42:54 +02:00
Joas Schilling
3c38fcce40 Merge pull request #2621 from Dragooon/ticket/12732
[ticket/12732] Add Skype custom profile field

* Dragooon/ticket/12732:
  [ticket/12732] Update schema.json for Skype
  [ticket/12732] Add functional test for Skype profile field
  [ticket/12732] Values shouldn't be escaped for schema_data.sql
  [ticket/12732] Set field_active to 1 for Skype's field
  [ticket/12732] Add unit tests for ALPHA_PUNCTUATION
  [ticket/12732] Missing comma after validation definition
  [ticket/12732] Improve ALPHA_PUNCTUATION description
  [ticket/12732] Use user info instead of chat as default Skype action
  [ticket/12732] Add Skype custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
	tests/profilefields/type_string_test.php
2014-06-20 23:39:54 +02:00
Joas Schilling
b9890c6a4c Merge pull request #2612 from Dragooon/ticket/12733
[ticket/12733] Add Twitter custom profile field

* Dragooon/ticket/12733:
  [ticket/12733] Add functional test for twitter profile field
  [ticket/12733] Values needn't be escaped for schema_data.sql
  [ticket/12733] Set field_active to 1 for Twitter
  [ticket/12733] Convert spaces to tabs
  [ticket/12733] Fix spacing for block header in profilefield_twitter.php
  [ticket/12733] Update schema.json
  [ticket/12733] Add Twitter custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
2014-06-20 23:37:51 +02:00
Shitiz Garg
03c5de594e [ticket/12731] Add YouTube custom profile field
PHPBB3-12731
2014-06-20 19:21:57 +05:30
Shitiz Garg
deae22b85f [ticket/12733] Convert spaces to tabs
PHPBB3-12733
2014-06-20 19:21:35 +05:30
Shitiz Garg
04e43e2087 [ticket/12733] Fix spacing for block header in profilefield_twitter.php
PHPBB3-12733
2014-06-20 19:21:35 +05:30
Shitiz Garg
fac6ab1fd4 [ticket/12733] Add Twitter custom profile field
PHPBB3-12733
2014-06-20 19:21:35 +05:30
Shitiz Garg
2ba12a17b2 [ticket/12729] Convert spaces to tabs
PHPBB3-12729
2014-06-20 18:10:08 +05:30
Shitiz Garg
e127a4fcce [ticket/12729] Fix block header spacing for profilefield_facebook.php
PHPBB3-12729
2014-06-20 18:10:08 +05:30
Shitiz Garg
ab47798a3e [ticket/12729] Unnecessary whitespace in profilefield_facebook.php
PHPBB3-12729
2014-06-20 18:10:08 +05:30
Shitiz Garg
310b8af148 [ticket/12729] Add Facebook custom profile field
PHPBB3-12729
2014-06-20 18:10:08 +05:30
Shitiz Garg
da4b1d25a1 [ticket/12732] Use user info instead of chat as default Skype action
PHPBB3-12732
2014-06-20 16:37:42 +05:30
Shitiz Garg
28012dc9e1 [ticket/12732] Add Skype custom profile field
PHPBB3-12732
2014-06-20 16:37:42 +05:30
Andreas Fischer
5964ca21c2 Merge pull request #2525 from Nicofuma/ticket/12638
[ticket/12638] v30x\local_url_bbcode break the migrations if we don't use the auto updater

* Nicofuma/ticket/12638:
  [ticket/12638] Use require if phpbb_require_updated isn't available
2014-06-17 21:04:47 +02:00
Andreas Fischer
f27be59cf1 Merge pull request #2600 from Nicofuma/ticket/12715
[ticket/12715] Fix mistakes in the doc blocks

* Nicofuma/ticket/12715: (30 commits)
  [ticket/12715] Add missing new line in the notification manager
  [ticket/12715] Cleanup comments in \phpbb\symfony_request
  [ticket/12715] Cleanup comments in \phpbb\permissions
  [ticket/12715] Cleanup comments in \phpbb\path_helper
  [ticket/12715] Cleanup comments in \phpbb\pagination
  [ticket/12715] Cleanup comments in \phpbb\datetime
  [ticket/12715] Cleanup comments in \phpbb\content_visibility
  [ticket/12715] Cleanup comments in \phpbb\tree\*
  [ticket/12715] Cleanup comments in \phpbb\template\*
  [ticket/12715] Cleanup comments in \phpbb\plupload\*
  [ticket/12715] Cleanup comments in \phpbb\profilefields\*
  [ticket/12715] Cleanup comments in \phpbb\passwords\*
  [ticket/12715] Cleanup comments in \phpbb\notification\*
  [ticket/12715] Cleanup comments in \phpbb\mimetype\*
  [ticket/12715] Cleanup comments in \phpbb\message\*
  [ticket/12715] Cleanup comments in \phpbb\log\*
  [ticket/12715] Cleanup comments in \phpbb\lock\*
  [ticket/12715] Cleanup comments in \phpbb\groupposition\*
  [ticket/12715] Cleanup comments in \phpbb\feed\*
  [ticket/12715] Cleanup comments in \phpbb\extension\*
  ...
2014-06-16 01:12:03 +02:00
Tristan Darricau
3039d000c6 [ticket/12715] Cleanup comments in \phpbb\db\*
PHPBB3-12715
2014-06-15 19:14:35 +02:00
Marc Alexander
2ca9e25bf2 [ticket/12712] Remove unneeded GROUP BY clause to fix query for mssql
PHPBB3-12712
2014-06-15 17:09:07 +02:00
Nils Adermann
694f8391c9 Merge remote-tracking branch 'github-marc1706/ticket/12352' into develop-ascraeus
* github-marc1706/ticket/12352: (33 commits)
  [ticket/12352] Do not check hashes that don't have the necessary length
  [ticket/12352] Update file headers to fit new format
  [ticket/12352] Use custom provider collection for auth providers
  [ticket/12352] Add checks for existing user_pass_convert to migrations
  [ticket/12352] Remove usages of user_pass_convert column
  [ticket/12352] Update schema json file
  [ticket/12352] Remove user_pass_convert column from database
  [ticket/12352] Check each newly added passwords driver in manager_test
  [ticket/12352] Add get_settings_only method to passwords driver base
  [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords
  [ticket/12352] Add tests for wcf1 and wcf2 drivers
  [ticket/12352] Add driver for woltlab community framework 1 passwords
  [ticket/12352] Add driver for woltlab community framework 2 passwords
  [ticket/12352] Add missing $ to md5_mybb and md5_vb driver
  [ticket/12352] Fix spacing in passwords tests
  [ticket/12352] Add passwords driver for vB passwords
  [ticket/12352] Use correct hashing method in md5_mybb driver
  [ticket/12352] Add driver for myBB md5 passwords
  [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
  [ticket/12352] Add passwords driver for sha1 password hashes
  ...
2014-06-11 14:27:57 +02:00
Nils Adermann
b6232aa9b2 Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into develop-ascraeus
* github-nickvergessen/ticket/10073: (36 commits)
  [ticket/10073] Fix button descriptions
  [ticket/10073] Do not check disable boxes by default
  [ticket/10073] Store values with config_text in the ACP
  [ticket/10073] Move config values to config_text
  [ticket/10073] Fix request usage
  [ticket/10073] Deduplicate template variable names
  [ticket/10073] Get service from container
  [ticket/10073] Fix more "Contact Us" strings
  [ticket/10073] Move template code into the template
  [ticket/10073] Make contact page available when board is disabled
  [ticket/10073] Change name of the ACP module
  [ticket/10073] Deduplicate posting buttons code in ACP
  [ticket/10073] Use phpbb_validate_email to verify email address
  [ticket/10073] Add tests for new validate_email()
  [ticket/10073] Split email validation from email ban and taken checks
  [ticket/10073] Deduplicate the if statement
  [ticket/10073] Fallback to board_contact when contact page is disabled
  [ticket/10073] Remove language string from rebase conflict
  [ticket/10073] Add ACP module to add bbcode text for contact admin info
  [ticket/10073] Add new configs to the schema
  ...
2014-06-09 17:55:25 +02:00
Joas Schilling
e3c3a5d2a7 [ticket/10073] Do not check disable boxes by default
PHPBB3-10073
2014-06-09 01:36:19 +02:00
Marc Alexander
94b2b64ca1 [ticket/12352] Update file headers to fit new format
PHPBB3-12352
2014-06-01 21:36:53 +02:00
Marc Alexander
306beab4cb [ticket/12352] Add checks for existing user_pass_convert to migrations
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
dde9201975 [ticket/12352] Remove user_pass_convert column from database
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
f78b99dce4 [ticket/12352] Add $CP$ prefix to passwords that need to be converted
Also set user_pass_convert to 0 in the process of doing so.

PHPBB3-12352
2014-06-01 21:31:04 +02:00