Commit graph

7832 commits

Author SHA1 Message Date
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
Matt Friedman
73d6855edf [ticket/10155] Make effectively installed test more specific
PHPBB3-10155
2013-03-22 11:22:25 -07: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
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
ac26be98c6 [ticket/10155] Use more descriptive title for migration file
PHPBB3-10155
2013-03-17 17:01:38 -07:00
Andreas Fischer
58d7acbf5a [ticket/11452] Now notification_method_email checks whether user has address.
Make sure the user has an email address set before offering email
notifications. The address could be missing for whatever reason, e.g. external
authentication. This is also consistent with XMPP/Jabber now.

PHPBB3-11452
2013-03-17 19:54:32 +01:00
Andreas Fischer
c9e7247ab4 [ticket/11445] Add abstract class phpbb_notification_method_messenger_base.
PHPBB3-11445
2013-03-16 21:50:30 +01:00
Joas Schilling
c50af28077 [ticket/11438] Add spaces after # comment start and before \ line breaks
PHPBB3-11438
2013-03-16 01:18:15 +01:00
erangamapa
21a9462553 [ticket/11106] Added missing line breaks.
Added two missing line breaks into 'edited by' message.

PHPBB3-11106
2013-03-16 00:05:12 +05:30
Matt Friedman
56914e72b7 [ticket/10155] Use new migration file for jQuery config update 2013-03-15 09:51:34 -07:00
Joas Schilling
3b0cdc5362 [ticket/11334] Allow parameters to be specified in the route
PHPBB3-11334
2013-03-15 15:21:15 +01:00
Joas Schilling
076711d9a9 [ticket/11334] Use mocks instead of making parameters optional
PHPBB3-11334
2013-03-15 09:18:14 -04:00
Joas Schilling
ff9a0e4ef4 [ticket/11334] Expand functionality of helper->url()
Expanded the functionality of helper->url() to support all parameters of
append_sid() itself.

PHPBB3-11334
2013-03-15 09:18:12 -04:00
David King
5850a2cbf6 [ticket/11334] Remove extraneous period
PHPBB3-11334
2013-03-15 09:18:10 -04:00
David King
5e89ce1898 [ticket/11334] Make url helper method public
PHPBB3-11334
2013-03-15 09:18:08 -04:00
David King
d3e2fae66d [ticket/11334] Add a test for the controller helper URL method
PHPBB3-11334
2013-03-15 09:18:07 -04:00
David King
8c512b0d2d [ticket/11334] Properly generate controller URL until paths issue gets fixed
PHPBB3-11334
2013-03-15 09:18:06 -04:00
Joas Schilling
2b2bbf787c [ticket/11438] Add helpful comments from sample config to ACP output
PHPBB3-11438
2013-03-15 08:23:39 +01:00
Andreas Fischer
1694dc6e28 [ticket/11440] Cast values of the $user_ids array to integer before sql_in_set.
PHPBB3-11440
2013-03-15 01:22:00 +01:00
Andreas Fischer
b17c0aa098 [ticket/11440] Remove useless/incorrect comment.
PHPBB3-11440
2013-03-15 01:21:12 +01:00
Matt Friedman
a38a92424d [ticket/10155] Update jQuery to 1.8.3
Currently included jQuery is old by now, v1.6.2. We should update to
1.8.3. This allows us to take advantage of the latest form of jQuery
event delegation ($.on). I don't think it wise to update to jQuery
1.9.x yet, as many 3rd party scripts still need to be updated to cope
with its deprecated features ($.browser). Therefor, 1.8.3 is the latest
and most widely compatible stable version right now.

PHPBB3-10155
2013-03-14 10:45:17 -07:00
Joas Schilling
d41cf293e1 [ticket/9657] Check for post visibility when searching with Sphinx
This update will require admins to manually update their Sphinx config
file aswell as to delete the index and rebuild it from scratch. Before
this is done the search will not be usable anymore.

PHPBB3-9657
2013-03-14 12:10:07 +01:00
Joas Schilling
567eefb2bd [ticket/11362] Correctly sanitise the directory path
We need to correctly remove ../ form the path if possible by removing the
previous folder aswell. Otherwise the finder is unable to locate /adm/style
directories in extensions as he is looking for /adm/../adm/style instead.

PHPBB3-11362
2013-03-12 22:35:31 +01:00
Nathan Guse
d4ee7718b9 Merge remote-tracking branch 'remotes/Marc/ticket/11404' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11404:
  [ticket/11404] Remove version ID from manager_test.php file header
  [ticket/11404] Add tests for phpbb_avatar_manager::clean_row()
  [ticket/11404] Convert manager_test to UNIX line endings
  [ticket/11404] Use a default data row if $row is empty in clean_row()
  [ticket/11404] Return empty array of avatar data if $row is empty
2013-03-12 14:48:07 -05:00
Joas Schilling
5eef287646 [ticket/11310] Add hashes to action links to prevent CSRF attacks
PHPBB3-11310
2013-03-12 17:19:30 +01:00
Joas Schilling
b712cff496 [ticket/9657] Populate data about post's delete status in mcp_post
PHPBB3-9657
2013-03-12 11:36:40 +01:00
erangamapa
df98de971c [ticket/11106] Undefined index EDITED_TIME_TOTAL notice.
When viewing a private message, when message edit count is 1
Undefined index EDITED_TIME_TOTAL php notice appears. Changed
the message formatting method to what is used in viewtopic.php.

PHPBB3-11106
2013-03-12 10:19:29 +05:30
Joas Schilling
b727e1eeda [ticket/9657] Correctly split disapproving from perma deleting posts
PHPBB3-9657
2013-03-11 16:37:43 +01:00
Joas Schilling
f6dd688e72 [ticket/9657] Fix missing global $phpbb_container
PHPBB3-9657
2013-03-11 12:40:33 +01:00
Joas Schilling
147c98fa32 [ticket/9657] Fix newly added empty line
PHPBB3-9657
2013-03-10 22:21:38 +01:00
Joas Schilling
cc5ba36a06 [ticket/9657] Cast IDs to integer
PHPBB3-9657
2013-03-10 22:18:37 +01:00
Joas Schilling
7db5eec5d2 [ticket/9657] Correctly increase users post count when approving posts
PHPBB3-9657
2013-03-10 22:15:29 +01:00
Nathaniel Guse
d6930df7a2 Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into develop
# By Dhruv
# Via Dhruv
* remotes/dhruv/ticket/11303:
  [ticket/11303] rename attribute to timezone-preselect
  [ticket/11303] remove additional brackets
  [ticket/11303] use S_TZ_PRESELECT in subsilver
  [ticket/11303] add S_TZ_PRESELECT template var
2013-03-09 19:08:51 -06:00
Nathaniel Guse
3f5d938a95 Merge remote-tracking branch 'remotes/marc/ticket/11323' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/11323:
  [ticket/11323] Reduce additional code and revert regex to previous one
  [ticket/11323] Enable tests for inclusion of defined variables
  [ticket/11323] Correctly treat variables in template defines
2013-03-09 19:02:44 -06:00
Nathaniel Guse
48bad80f4a Merge remote-tracking branch 'remotes/Blitze/ticket/11383' into develop
# By OpenShift guest
# Via OpenShift guest
* remotes/Blitze/ticket/11383:
  [ticket/11383] Correctly revert modules added/removed by migrator
2013-03-09 18:33:19 -06:00
Nathaniel Guse
36de18e174 [ticket/11423] Send unformatted usernames to the email template
PHPBB3-11423
2013-03-09 09:12:46 -06:00
Joas Schilling
20f84c3795 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11408] user_jabber instead of jabber
  [ticket/10202] Rename method names _all() to _array().
  [ticket/10202] Add migration file for config_db_text.
  [ticket/10202] Upgrade TEXT to the bigger MTEXT.
  [ticket/10202] Improve method documentation.
  [ticket/10202] SQL escape the table name.
  [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
  [ticket/10202] Define phpbb_config_db_text as a service.
  [ticket/10202] Add tests for phpbb_config_db_text.
  [ticket/10202] Adjust method names to guidelines.
  [ticket/10202] Add database schema for phpbb_config_db_text.
  [ticket/10202] Implementation of config options with arbitrary length values.
  [ticket/11166] Add ajaxify support to normal ACP confirm_box()
  [ticket/11166] Fix several custom confirm templates in prosilver
  [ticket/11166] Add caption to AJAX confirm box default template
  [ticket/11166] Fix typo in comment
  [ticket/11166] Use provided custom templates on AJAX confirm box
2013-03-07 16:09:55 +01:00
Joas Schilling
1a49852413 [ticket/9657] Remove unused email variables
PHPBB3-9657
2013-03-07 14:15:14 +01:00
Joas Schilling
bff6cf40ba [ticket/9657] Fix colum name in migration file
PHPBB3-9657
2013-03-07 14:02:11 +01:00
Joas Schilling
60c0da8b54 [ticket/9657] Remove empty update_data() method from p2 migration
PHPBB3-9657
2013-03-07 13:15:55 +01:00
Marc Alexander
bb58462724 [ticket/11404] Use a default data row if $row is empty in clean_row()
A statically defined $default_row will be used inside the
phpbb_avatar_manager::clean_row() method if the $row passed to it is
empty.

PHPBB3-11404
2013-03-07 13:03:27 +01:00
David King
d658d6640b Merge remote-tracking branch 'EXreaction/ticket/11408' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11408:
  [ticket/11408] user_jabber instead of jabber
2013-03-06 17:01:30 -05:00
Nathan Guse
9ca15267fa Merge remote-tracking branch 'remotes/bantu/ticket/10202' into develop
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/10202:
  [ticket/10202] Rename method names _all() to _array().
  [ticket/10202] Add migration file for config_db_text.
  [ticket/10202] Upgrade TEXT to the bigger MTEXT.
  [ticket/10202] Improve method documentation.
  [ticket/10202] SQL escape the table name.
  [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
  [ticket/10202] Define phpbb_config_db_text as a service.
  [ticket/10202] Add tests for phpbb_config_db_text.
  [ticket/10202] Adjust method names to guidelines.
  [ticket/10202] Add database schema for phpbb_config_db_text.
  [ticket/10202] Implementation of config options with arbitrary length values.
2013-03-06 15:36:15 -06:00
Nathaniel Guse
3aab72d79b [ticket/11408] user_jabber instead of jabber
PHPBB3-11408
2013-03-06 09:53:41 -06:00
Joas Schilling
74a9ecfd24 [ticket/9657] Fix wrongly added notifications when post is posted softdeleted
The post/topic should not trigger "*_in_queue" notifications if it is
softdeleted, as it is not in the queue then.

PHPBB3-9657
2013-03-06 16:29:50 +01:00
Joas Schilling
9bddf73d31 [ticket/9657] Add migration files for updating the database
PHPBB3-9657
2013-03-06 13:53:24 +01:00
Joas Schilling
e1f5e98fbc [ticket/9657] Correctly state when to refresh last/first post info on approving
PHPBB3-9657
2013-03-06 13:05:15 +01:00
Marc Alexander
5963905825 [ticket/11404] Return empty array of avatar data if $row is empty
While creating a group in the acp, the group data ($group_row) is empty.
Due to that array_combine in phpbb_avatar_manager::clean_row() will cause
PHP Warnings. In addition to that the required indexes 'avatar',
'avatar_width', 'avatar_height', and 'avatar_type' won't be defined. This
patch will solve that issue.

PHPBB3-11404
2013-03-06 11:32:23 +01:00
Joas Schilling
d0d9005166 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3:
  [ticket/11402] Fix undefined index in post/topic_in_queue
  [ticket/11400] If email is disabled, disable it for notifications
2013-03-06 07:39:17 +01:00