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

455 Commits

Author SHA1 Message Date
Joas Schilling
3315702b5f [ticket/12370] Do not delete topic notifications when the topic is visible
We should only delete the topic notifications, when the topic is not approved
anymore. This happens, when the post was the last approved but is now
unapproved because the user is on queue, or when it has been softdeleted while
editing.

PHPBB3-12370
2014-04-07 19:13:32 +02:00
Marc Alexander
e4e3df0b37 Merge branch 'ticket/10851' into ticket/10851-ascraeus 2014-04-04 11:48:17 +02:00
Marc Alexander
519adb5060 [ticket/10851] Set disallowed content to empty array if checking is disabled
The disallowed content defaults to a standard set of mimetype triggers by
default. If one doesn't want to check the attachments mimetype triggers then
we need to set the disallowed content to an empty array.

PHPBB3-10851
2014-04-03 16:06:46 +02:00
Nathan Guse
60de5e66de Merge pull request #2030 from rxu/ticket/12190
Add core event "core.modify_submit_post_data"
2014-02-19 10:50:21 -06:00
rxu
01bf27f789 [ticket/12190] Add core event "core.modify_submit_post_data"
Add core event - core.modify_submit_post_data
to submit_post() function. This allows extensions to modify the
whole post data before the post submitting, or even provide
its own post submit procedure.

PHPBB3-12190
2014-02-20 00:47:26 +08:00
Cesar G
779868e4f4 [ticket/12136] Use new pagination class in generate_smilies().
PHPBB3-12136
2014-01-26 17:57:16 -08:00
Cesar G
be52a823f8 [ticket/11915] Provide the attachment file size to the template.
PHPBB3-11915
2014-01-17 19:20:36 -08:00
David King
6b081433c5 [ticket/12069] Globalize in submit_post()
PHPBB3-12069
2013-12-08 15:08:30 -05:00
David King
0b76880816 [ticket/12069] Fix event documentation
PHPBB3-12069
2013-12-08 15:01:53 -05:00
David King
fdac051956 [ticket/12069] Add core.submit_post_end event
PHPBB3-12069
2013-12-08 14:42:46 -05:00
Andreas Fischer
2050a39da7 [feature/plupload/integration] Integration of Plupload
This commit is a highly-refactored and up-to-date version of Fyorl's work
which was part of his Google Summer of Code 2012 project "Attachment
Improvements".

PHPBB3-10929
2013-10-11 17:40:16 +02:00
Andreas Fischer
5ddb0ba629 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11769] Allow '0' as username in notification mails
  [ticket/11769] Fix language issues in the doc blocks
  [ticket/11769] Correctly supply the post author's username in posting.php

Conflicts:
	phpBB/includes/functions_posting.php
2013-09-02 12:31:27 +02:00
Joas Schilling
42b9c3c479 [ticket/11769] Allow '0' as username
PHPBB3-11769
2013-09-02 01:11:40 +02:00
Joas Schilling
d717203af1 [ticket/11769] Fix language issues in the doc blocks
PHPBB3-11769
2013-08-23 23:49:11 +02:00
Joas Schilling
2845b153d8 [ticket/11769] Correctly supply the post author's username in posting.php
Only supply the username, when it is a guest posting or we edit and it was
supplied, otherwise post_data might hold data of the post we quote, in which
case username is the original poster, not the current one.

PHPBB3-11769
2013-08-23 23:17:52 +02:00
Joas Schilling
3f86d50338 Merge remote-tracking branch 'brunoais/ticket11639' into develop
* brunoais/ticket11639:
  [ticket/11639] Changing how censorship is handled.
  [ticket/11639] Removed a non-needed unset
  [ticket/11639] Whitespace fixing
  [ticket/11639] Whitespace fixing
  [ticket/11639] Added an useful comment.
  [ticket/11639] generate_text_for_display on functions_posting.php
2013-08-04 01:56:39 +02:00
brunoais
28a0a9e0b1 [ticket/11639] Changing how censorship is handled.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-08-03 21:46:06 +01:00
Bruno Ais
1372b4f208 [ticket/11639] Removed a non-needed unset
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-07-24 10:33:06 +01:00
Marc Alexander
effafa4b4d [ticket/11717] Add 'has' to boolean variable and reduce line length
PHPBB3-11717
2013-07-22 10:42:46 +02:00
Marc Alexander
603dc1f786 [ticket/11717] Use topic_posts_approved instead of topic_replies
Due to the move to soft-delete, the topic_replies column no longer exists
in the topics table. Instead, the column topic_posts_approved should be used.

PHPBB3-11717
2013-07-20 21:21:36 +02:00
Bruno Ais
0ef1bcac2b [ticket/11639] Whitespace fixing
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-07-20 16:31:08 +01:00
Bruno Ais
5f19ca6a6f [ticket/11639] Whitespace fixing
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-07-15 20:09:59 +01:00
Bruno Ais
dde9a1fb27 [ticket/11639] Added an useful comment.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-07-15 20:08:17 +01:00
Bruno Ais
f96f2a9e23 [ticket/11639] generate_text_for_display on functions_posting.php
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11639
2013-07-15 20:06:54 +01:00
Joas Schilling
9aed758c13 [ticket/9657] Use the service instead of the static class
PHPBB3-9657
2013-07-11 14:24:07 +02:00
Joas Schilling
bdb7ec0ceb Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission
* phpbb/develop: (704 commits)
  [ticket/11630] Improvements to the PHP lint pre-commit hook
  [feature/auth-refactor] Move auth providers to separate directory
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  ...

Conflicts:
	phpBB/docs/sphinx.sample.conf
	phpBB/feed.php
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
2013-07-11 11:41:48 +02:00
Andreas Fischer
5fa25880e2 [ticket/11586] Move $filedata['thumbnail'] to where it might be returned.
PHPBB3-11586
2013-06-03 16:24:12 +02:00
Andreas Fischer
50e3173e8c [ticket/11586] Combine $filedata['post_attach'] assign into a single statement.
PHPBB3-11586
2013-06-03 16:24:12 +02:00
Andreas Fischer
11c80c0402 [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.
PHPBB3-11586
2013-06-03 16:14:22 +02:00
Andreas Fischer
cb54f56c3d [ticket/11586] Combine administrator/moderator checks together.
PHPBB3-11586
2013-06-03 16:07:19 +02:00
Andreas Fischer
99d089ce9f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11145] Wrong error thrown when uploading a bigger image.
2013-06-03 15:58:32 +02:00
erangamapa
8191755cca [ticket/11145] Wrong error thrown when uploading a bigger image.
When attaching an image to a post with a size larger than maximum defined in
php.ini, 'ATTACHED_IMAGE_NOT_IMAGE' error is thrown. $file->is_image() is
returning false value when image size is too large. Therefore, moved
not image test down after image size test.

PHPBB3-11145
2013-05-25 10:50:43 +05:30
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
42c062cedf Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: (480 commits)
  [ticket/6723] Show info that message has been deleted before delivery
  [ticket/11385] Fix issue with migration module tool not getting extension module info
  [ticket/11386] Fix failing tests from constructor changes
  [ticket/11386] Fix circular reference error & serialize error
  [ticket/11386] Remove tests that check if finder cache is working
  [ticket/11386] Forgot to get the migration classes
  [ticket/11386] Update tests with new constructors for ext.manager/migrator
  [ticket/11386] Use finder to find migration files
  [ticket/11363] Fix to make get_module_infos get from all extensions
  [ticket/11381] Make finder able to search in all available extensions
  [ticket/11103] Revert whitespace changes
  [ticket/11103] Few more minor language things
  [ticket/11103] Don't call generate_board_url many times
  [ticket/11103] Case time in queries as an int
  [ticket/11103] Fix effectively installed check
  [ticket/11103] Remove padding from notifications for now.
  [ticket/11363] Fix a couple bugs and throw errors if the file not found
  [ticket/11372] Migrator should only check if effectively installed if not
  [ticket/11363] Load module info files for extensions too
  [ticket/11103] Notifications Migration file
  ...

Conflicts:
	phpBB/includes/functions_posting.php
	phpBB/includes/mcp/mcp_queue.php
	phpBB/includes/search/fulltext_mysql.php
	phpBB/includes/search/fulltext_native.php
	phpBB/includes/search/fulltext_postgres.php
	phpBB/includes/search/fulltext_sphinx.php
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ajax.js
2013-03-03 20:06:52 +01:00
Nathan Guse
51e0f002ee Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Oleg Pudeyev (37) and others
# Via Oleg Pudeyev (24) and others
* 'develop' of github.com:phpbb/phpbb3: (179 commits)
  [ticket/11323] Add tests for inclusion of defined variables
  [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
  [ticket/11321] Recreate schema files with develop/create_schema_files.php
  [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31
  [ticket/11313] Use correct object el instead of eel in alt_text callback
  [ticket/11301] Guidelines: Add spaces in front and after the / operator.
  [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
  [ticket/11311] Include asset core.js in subsilver2 overall_footer.html
  [ticket/10949] Remove not needed comma
  [ticket/11309] phpbb_extension_interface::disable_step correct docblock.
  [ticket/10949] Converted missing code to new JS coding guidelines
  [ticket/11302] Correctly select first timezone or selected timezone
  [ticket/11305] Mock container for cache driver in functional create_user()
  [ticket/11305] Check for $cache being null before using it in db drivers.
  [ticket/10805] Compare phpbbAlertTimer against null
  [ticket/11305] Define hook finder as a service on the container.
  [ticket/11305] Adjust comment.
  [ticket/11305] Use phpbb_create_default_container.
  [ticket/11305] Create a normal container during final installation step.
  [ticket/11305] Retrieve cache driver from container rather than cache service.
  ...

Conflicts:
	phpBB/install/schemas/firebird_schema.sql
	phpBB/install/schemas/mssql_schema.sql
	phpBB/install/schemas/mysql_40_schema.sql
	phpBB/install/schemas/mysql_41_schema.sql
	phpBB/install/schemas/oracle_schema.sql
	phpBB/install/schemas/postgres_schema.sql
	phpBB/install/schemas/sqlite_schema.sql
	phpBB/styles/subsilver2/template/overall_footer.html
2013-01-15 11:31:39 -06:00
Joas Schilling
e34b8ed094 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase
* 'develop' of https://github.com/phpbb/phpbb3: (544 commits)
  [feature/events] Fix improperly named event in documentation
  [feature/events] Fix alphabetization of events
  [feature/events] Put events in alphabetical order
  [feature/events] Make EVENTS.md lowercase
  [ticket/11285] Use more granularity in dependency checks in compress test
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.
  [ticket/10803] Show failure message until user dismisses it
  [ticket/10954] Add missing semi-colon
  [ticket/10954] Make sure to mark subforums unread and add small fixes
  [feature/events] Use ` to escape HTML tags in markdown
  [feature/events] Remove HTML tags from markdown so they don't get parsed
  [ticket/10954] Miscellaneous coding fixes
  [feature/events] Remove extraneous space
  [feature/events] Add markdown template event documentation file
  [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
  [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
  [feature/events] Fix typo in event name
  [ticket/10763] Use self when calling get_extension() in filespec class
  [feature/events] Fix more subsilver2 events
  [feature/events] Fix some subsilver2 events
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/posting.php
2012-12-20 22:51:38 +01:00
Andreas Fischer
3fefa5bb13 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.

Conflicts:
	phpBB/posting.php
2012-12-20 14:28:01 +01:00
Andreas Fischer
917a2fa9a6 [ticket/10880] The m_approve permisson no longer implies f_noapprove.
PHPBB3-10880
2012-12-19 22:02:39 -05:00
Nathan Guse
249f3c8885 [ticket/11103] Instantiate $phpbb_notifications as needed
https://github.com/phpbb/phpbb3/pull/992#discussion_r2413976

PHPBB3-11103
2012-12-13 19:19:40 -06:00
Nathan Guse
2afb8b9df8 [ticket/11103] Create user loader class, update for DIC
Create a very basic user loader class to handle querying/storing
user data in a centralized location.

Use DIC collection service for notification types/methods.

Cleanup unused dependencies.

Fix some other issues.

PHPBB3-11103
2012-11-20 22:54:16 -06:00
Joas Schilling
948bfcbe77 Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  [ticket/11050] make all properties protected in all search backends
  [ticket/11050] get_common_words() returns empty array for sphinx
  [ticket/11050] fix tidied search query docblock language
  [ticket/11050] fix min/max length docblock language
  [ticket/11050] multi sentences separated by period in docblocks
  [ticket/11050] fix separated spelling in docblock
  [ticket/11050] fix split words doc block language
  [ticket/11050] remove class word from docblocks
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/language/en/acp/permissions_phpbb.php
	phpBB/styles/prosilver/template/posting_editor.html
2012-11-10 12:27:19 +01:00
Joas Schilling
f77a6eaab5 [feature/soft-delete] Fix the rest of *_approved and the delete_post unit test
PHPBB3-9567
2012-11-10 11:24:52 +01:00
Joas Schilling
9c2a58eff4 [feature/soft-delete] Append _approved to *_posts and *_topics column names
PHPBB3-9567
2012-11-09 13:37:53 +01:00
Joas Schilling
63e3baf0eb [feature/soft-delete] Correctly manage softdeleting via posting.php
PHPBB3-9567
2012-11-02 14:14:20 +01:00
Nathan Guse
a811e65147 [ticket/11103] Revert an overwrite that occured on merging from develop
PHPBB3-11103
2012-10-29 18:18:33 -05:00
Joas Schilling
ed602857e6 [feature/soft-delete] Correctly increase topics post counts when posting
PHPBB3-9567
2012-10-28 22:37:00 +01:00
Joas Schilling
43e6b3a921 [feature/soft-delete] Fix some more topic/post count handling
Only disapproving in queue is missing.

PHPBB3-9567
2012-10-23 16:59:33 +02:00
Joas Schilling
eb9c39971b [feature/soft-delete] Fix forum syncing in ACP and deleting posts
PHPBB3-9567
2012-10-22 17:34:37 +02:00
Joas Schilling
90154db1db [feature/soft-delete] Fix submit_post() topic_replies* usage
PHPBB3-9567
2012-10-22 16:38:53 +02:00
Nathan Guse
94d682f774 [ticket/11103] Use the full class name as the item_type/method
This is going to require you recreate the db tables.

PHPBB3-11103
2012-10-20 20:58:53 -05:00