Commit graph

16511 commits

Author SHA1 Message Date
Andreas Fischer
dc766f29b4 [ticket/11469] Have all methods of phpbb_db_sql_insert_buffer provide feedback.
PHPBB3-11469
2013-03-27 19:19:26 +01:00
Andreas Fischer
8c5fcac232 [ticket/11469] Add benefits over collecting huge insert arrays to class doc.
PHPBB3-11469
2013-03-27 18:22:59 +01:00
Andreas Fischer
55fb87ff18 Merge remote-tracking branch 'nickvergessen/ticket/bantu/11469' into ticket/11469
* nickvergessen/ticket/bantu/11469:
  [ticket/11469] Use method to check config count, instead of repeating it
  [ticket/11469] Return after sql_multi_insert when multi_insert is false
  [ticket/11469] Add some basic unit tests for phpbb_db_sql_insert_buffer
2013-03-27 18:11:49 +01:00
Andreas Fischer
43b6ae3fee Merge remote-tracking branch 'phpbb/develop' into ticket/11469
* phpbb/develop:
  [ticket/11476] Remove pass-by-reference from sql_mutli_insert
  [ticket/11466] Remove old database driver files from PHPUnit exclude
  [ticket/11448] Use of $user_id parameter to mark a user's notifications read
  [ticket/11460] Add default behaviour tests for notification and email types.
  [ticket/11460] Configure functional test board email using dummy SMTP data.
  [ticket/11460] Add test for whether post_email and topic_email are checked.
  [ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case.
  [ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.
2013-03-27 18:11:38 +01:00
Andreas Fischer
94a15f85a6 [ticket/11469] Add example code to class documentation.
PHPBB3-11469
2013-03-27 18:11:31 +01:00
Andreas Fischer
b583f6d8d9 Merge remote-tracking branch 'nickvergessen/ticket/11476' into develop
* nickvergessen/ticket/11476:
  [ticket/11476] Remove pass-by-reference from sql_mutli_insert
2013-03-27 17:55:42 +01:00
Joas Schilling
c629b2c7b3 [ticket/11476] Remove pass-by-reference from sql_mutli_insert
The method never writes to the array passed by reference. So it can be
passed by value instead to avoid certain problems.

PHPBB3-11476
2013-03-27 15:01:36 +01:00
Joas Schilling
af9f30cd52 [ticket/11469] Use method to check config count, instead of repeating it
PHPBB3-11469
2013-03-27 14:09:04 +01:00
Joas Schilling
bf6f2c5875 [ticket/11469] Return after sql_multi_insert when multi_insert is false
PHPBB3-11469
2013-03-27 14:00:47 +01:00
Joas Schilling
8dd26dee83 [ticket/11469] Add some basic unit tests for phpbb_db_sql_insert_buffer
PHPBB3-11469
2013-03-27 14:00:46 +01:00
Joas Schilling
bdd2062a66 [ticket/11474] Add test user with only global m_approve permissions
PHPBB3-11405
PHPBB3-11474
2013-03-27 11:12:33 +01:00
Nils Adermann
b7778f7fde Merge remote-tracking branch 'github-bantu/ticket/11460' into develop
* github-bantu/ticket/11460:
  [ticket/11460] Add default behaviour tests for notification and email types.
  [ticket/11460] Configure functional test board email using dummy SMTP data.
  [ticket/11460] Add test for whether post_email and topic_email are checked.
  [ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case.
  [ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.
2013-03-27 06:31:53 +01:00
Nils Adermann
c9aa39be5d Merge pull request #1318 from imkingdavid/ticket/11448
[ticket/11448] Use of $user_id parameter to mark a user's notifications read
2013-03-26 15:19:28 -07:00
Nils Adermann
59e0196846 Merge pull request #1319 from imkingdavid/ticket/11466
[ticket/11466] Remove old database driver files from PHPUnit exclude
2013-03-26 15:16:43 -07:00
David King
6ab9ef54a2 [ticket/11466] Remove old database driver files from PHPUnit exclude
As per the ticket comments, these can simply be removed, rather than having to
be renamed to the new file locations.

PHPBB3-11466
2013-03-26 17:21:35 -04:00
David King
6dddc22ec7 [ticket/11448] Use of $user_id parameter to mark a user's notifications read
Currently, the $user_id is a parameter but is not used. This patch fixes that.

PHPBB3-11448
2013-03-26 17:07:20 -04:00
Joas Schilling
d8a63047aa [ticket/11474] Clarify comment with "global" and forum_id = 0
Forum ID 0 in permission checks, checks the global moderator permission.

PHPBB3-11405
PHPBB3-11474
2013-03-26 20:20:51 +01:00
Joas Schilling
1af89968dd [ticket/11474] Check read permission before sending *_in_queue notifications
PHPBB3-11405
PHPBB3-11474
2013-03-26 20:20:26 +01:00
Joas Schilling
8a94e08e30 [ticket/11405] Add unit tests for post_in_queue
PHPBB3-11405
2013-03-26 20:17:26 +01:00
Joas Schilling
0f204595d9 [ticket/11405] Fix "only variables should be passed by reference"
PHPBB3-11405
2013-03-26 20:17:24 +01:00
Joas Schilling
81cf02e057 [ticket/11405] Order users in bookmark, in order to pass postgres tests
PHPBB3-11405
2013-03-26 13:54:33 +01:00
Marc Alexander
34cdbd0360 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314
Conflicts:
	phpBB/styles/prosilver/template/timezone.js
2013-03-26 13:18:54 +01:00
Marc Alexander
f0b0978538 [ticket/11314] Modify files to comply with coding standards
PHPBB3-11314
2013-03-26 13:13:33 +01:00
Joas Schilling
e20b0a4234 [ticket/11405] Use different fixtures so it's not a total mess
PHPBB3-11405
2013-03-26 13:06:04 +01:00
Joas Schilling
7e2f80ec0a [ticket/11405] Add unit tests for bookmarking
PHPBB3-11405
2013-03-26 12:59:35 +01:00
Joas Schilling
cdd45cb8ba [ticket/11405] Move test to submit_post_base.php and use data sets for testing
PHPBB3-11405
2013-03-26 12:58:14 +01:00
Marc Alexander
4870387f3a [ticket/11314] Fix JSHint issues in adm editor.js
This time without changing the behavior.

PHPBB3-11314
2013-03-26 11:19:03 +01:00
Marc Alexander
36168b311e [ticket/11314] Fix issues mentioned in jshint report
Additionally, the editor.js files are now the same file in both
subsilver2, prosilver, and the acp.

PHPBB3-11314
2013-03-26 10:31:28 +01:00
OpenShift guest
323a494cd1 [ticket/11458] Search for permission language files in extensions
Extensions that add new permission masks only need to add a permission file in
the language folder of the extension. The file must start with 'permissions_'
eg 'permissions_blog.php'. The permission language file will be automatically
included when viewing/setting permissions.

PHPBB3-11458
2013-03-25 18:21:48 -04:00
Andreas Fischer
fc8bf3f3c7 [ticket/11469] Add comment about using sql_multi_insert when not buffering.
PHPBB3-11469
2013-03-25 17:01:44 +01:00
Joas Schilling
053c75543d [ticket/11405] Correctly prefill the tables (missed the posts and not-types)
PHPBB3-11405
2013-03-25 15:34:18 +01:00
Joas Schilling
060876e627 [ticket/11405] Add a base class to avoid duplicated setUp() code
PHPBB3-11405
2013-03-25 15:16:29 +01:00
Joas Schilling
1259117d21 [ticket/11405] Sort $users array in order to prevent issues on postgres
PHPBB3-11405
2013-03-25 15:07:06 +01:00
Joas Schilling
499eded880 [ticket/11405] Add unit tests for quoted users notifications
PHPBB3-11405
2013-03-25 15:07:05 +01:00
Joas Schilling
7d5949ae3d [ticket/11405] Fix some coding style issues
PHPBB3-11405
2013-03-25 14:37:22 +01:00
Joas Schilling
a91ffe06c7 [ticket/11405] Send post notifications to forum subscribers
Like in 3.0 we should also send notifications about new posts to users
that subscribed to the forum. (Subscriptions are verbose)

PHPBB3-11405
2013-03-25 09:28:53 +01:00
Andreas Fischer
d3decaeedf [ticket/11460] Add default behaviour tests for notification and email types.
PHPBB3-11460
2013-03-24 23:42:13 +01:00
Joas Schilling
bc5f8e30d0 [ticket/11405] Add some basic tests for notifications in submit_post()
Poster, should NOT receive a notification
Topic subscribed, should receive a notification
Topic subscribed, but unauthed to read, should NOT receive a notification
Topic subscribed, but already notified, should NOT receive a new notification
Topic and forum subscribed, should receive ONE notification
Forum subscribed, should receive a notification
Forum subscribed, but already notified, should NOT receive a new notification

PHPBB3-11405
2013-03-23 13:20:32 +01:00
Andreas Fischer
02817158fc [ticket/11460] Configure functional test board email using dummy SMTP data.
PHPBB3-11460
2013-03-22 22:42:05 +01:00
Andreas Fischer
69df6b49db [ticket/11460] Add test for whether post_email and topic_email are checked.
PHPBB3-11460
2013-03-22 22:16:24 +01:00
Matt Friedman
73d6855edf [ticket/10155] Make effectively installed test more specific
PHPBB3-10155
2013-03-22 11:22:25 -07:00
Marc Alexander
11477a3f18 [ticket/11465] Move require_once() in unit test to the top of the file
PHPBB3-11465
2013-03-22 16:54:11 +01:00
Marc Alexander
fadcee77b9 [ticket/11465] Add unit tests for acp_modules::get_module_infos()
The tests add 3 different modules. One acp module that should be found
(acp/a_module), one acp module that should not be found (acp/fail_module),
and one mcp module that should work again (mcp/a_module). The modules'
info files had to be included as they were not auto-loaded for some
reason.
There are several test stages. First of, it is tested if the correct mcp
and acp module is returned. Afterwards, the proper loading of specified
modules is tested. One with an existing module and one with a not existing
module. Finally, the test concludes with trying to get the module info of
not existing ucp modules. Other classes like foobar would have also worked
for that check but I decided to use the ucp type of class as that is the
one type missing from the added test modules.

PHPBB3-11465
2013-03-22 10:26:01 +01:00
Andreas Fischer
16a6025372 [ticket/11469] Add SQL insert buffer allowing easier handling of multi inserts.
1. Tries to prevent going over max packet size by flushing to the database
   after a certain number of rows have been added.
2. Because of 1., it is less likely to reach a connection timeout when
   inserting a huge number of rows.
3. By flushing the buffer when a certain size is reached, memory usage should
   be lower compared to building the whole insert row set first.

PHPBB3-11469
2013-03-21 23:12:31 +01:00
Marc Alexander
aefca4b40f [ticket/11465] Use extension finder when adding extensions' acp modules
The method acp_modules::get_module_infos() needs to use the extension
finder whenever it is looking for a module's info file. While
transitioning to the new extension system, only the initial search for all
module info files was changed to the new system. Due to this it is not
possible to add an extension's acp/mcp/ucp module manually in the ACP.
This patch will always use the extension finder for the acp module's info
files and therefore properly find the needed file. Additionally, the code
has been cleaned up a little bit.

PHPBB3-11465
2013-03-21 14:59:53 +01:00
Andreas Fischer
15aec0bbb2 [ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case.
PHPBB3-11460
2013-03-21 03:07:50 +01:00
Matt Friedman
940d16b585 [ticket/11463] Add title attribute to topics in search results
We use this title attribute in viewforum_body.html, but not in
search_results.html. Perhaps we should, as this will maintain
consitency between all these topic view pages.

PHPBB3-11463
2013-03-20 11:39:06 -07:00
Oleg Pudeyev
8b464e87f0 Merge PR #1298 branch 'nickvergessen/ticket/11438' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11438:
  [ticket/11438] Add spaces after # comment start and before \ line breaks
  [ticket/11438] Add helpful comments from sample config to ACP output
  [ticket/11438] Add empty sql_query_pre to delta-source
  [ticket/11438] Move backslash to concatenate the query strings correctly
  [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()
2013-03-20 11:43:14 -04:00
Matt Friedman
3089f5d0bb [ticket/11461] cut doc entry to 79 cols
PHPBB3-11461
2013-03-19 13:32:48 -07:00
Matt Friedman
578ed03b7e [ticket/11461] Further clarify doc for viewtopic_body_footer_before
PHPBB3-11461
2013-03-19 13:32:48 -07:00