Commit graph

8558 commits

Author SHA1 Message Date
Nils Adermann
7c2239e75c Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus
* github-nickvergessen/ticket/12273: (55 commits)
  [ticket/12273] Move $extension to constructor so the path is always set
  [ticket/12273] Find events.md relative from the path not the phpbb root
  [ticket/12273] Do not look in extensions docs/ and tests/ directory
  [ticket/12273] Also check file for adm "Location:" events
  [ticket/12273] Do not allow template events in non-html files
  [ticket/12273] Fix return description
  [ticket/12273] Update exporter to allow specifying an extension
  [ticket/12273] Allow to filter events for extensions
  [ticket/12273] Remove old parameter from function call
  [ticket/12273] Fix table header for adm events
  [ticket/12273] Add root path to recursive_event_filter_iterator
  [ticket/12273] Fix missing classes in export_events_for_wiki.php
  [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter
  [ticket/12273] Use RecursiveDirectoryIterator in md_exporter
  [ticket/12273] Fix doc blocks
  [ticket/12273] Do not allow 3.1-A1 for template events
  [ticket/12273] Sort arguments alphabetically before exporting
  [ticket/12273] Do not allow 3.1-A1 version
  [ticket/12273] Update since version to 3.1.0-a* style
  [ticket/12273] Update existing events
  ...
2014-05-02 12:22:05 +02:00
Nils Adermann
d36795b844 Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into develop-ascraeus
* github-nickvergessen/ticket/12371:
  [ticket/12371] Fix language string
  [ticket/12371] Fix typos in comment
  [ticket/12371] Fix redirect link for approve_post and post_in_queue
  [ticket/12371] Delete the approve_post notification when editing a post
  [ticket/12371] Fix language in comment
  [ticket/12371] Reapprove the post and topic again in tests
  [ticket/12371] Correctly set is_starter when editing first post of the topic
  [ticket/12371] Add functional tests for reapproving
  [ticket/12371] Fix query in mcp_sorting()
  [ticket/12371] Rename disapprove and softdelete tests
  [ticket/12371] We do not group quote notifications anymore
  [ticket/12371] Fix SQL query
  [ticket/11772] Do not send out new topic/post notifications when reapproving
  [ticket/12052] Use different visibility when post was edited
  [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method
  [ticket/12371] Do not add unlimited users as responders
  [ticket/12371] Do not update the notification entry unneccessarily
  [ticket/12371] Do not delete post related notifications when a post is deleted
  [ticket/12371] Allow notification types to redirect to a different url
  [ticket/12371] Do not group "quote" notifications
2014-05-02 12:11:09 +02:00
Nathaniel Guse
5c54cd6a45 Merge remote-tracking branch 'remotes/Nicofuma/ticket/12445' into develop-ascraeus
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12445:
  [ticket/12445] Change the formulation
  [ticket/12445] Disapproved post: the name of the poster should be in logs
2014-05-01 21:46:34 -05:00
Joas Schilling
1ba6a45a78 Merge pull request #2362 from n-aleha/ticket/12186a
[ticket/12186] Move PM reports below post reports while installing for ascraeus

* n-aleha/ticket/12186a:
  [ticket/12186] Move PM reports below post reports while installing for ascraeus
  [ticket/12186] Move PM reports below post reports while installing
2014-04-29 21:29:18 +02:00
Andreas Fischer
89391dec08 [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.

PHPBB3-12458
2014-04-29 17:51:21 +02:00
n-aleha
edeeaa03c1 Merge branch 'ticket/12186' into ticket/12186a 2014-04-27 22:29:37 +03:00
Nicofuma
6ba61785f8 [ticket/12097] Bug fix and adding unit test
PHPBB3-12097
2014-04-26 15:46:50 +02:00
Nicofuma
a29f3c878a [ticket/12097] Validate_data() should work with class method
https://tracker.phpbb.com/browse/PHPBB3-12097

PHPBB3-12097
2014-04-26 14:10:10 +02:00
Nicofuma
af827bf2b4 [ticket/12199] Move deprecated functions to functions_compatibility.php
Currently 13 functions are marked as deprecated:
functions.php:
function set_var()
function request_var()
function set_config()
function set_config_count()
function tz_select()
function add_log()

functions_admin:
function cache_moderators()
function update_foes()

functions_compatibility:
function get_user_avatar()
function phpbb_hash()
function phpbb_check_hash()
function phpbb_clean_path()

functions_install:
function get_tables()

8 of them are still used in the core:
add_log              Used in many places (~198 calls)
get_tables           Used in install\install_convert::get_convert_settings
			and functions_install.php\connect_check_db
get_user_avatar      Used in phpbb\user_loader:get_avatar
phpbb_hash           Used in phpbb\db\migration\data\v30x\release_3_0_5_rc1
request_var          Used quite everywhere (~997 calls)
set_config           Used in many places (~129 calls)
set_config_count     Used in a few places (~37 calls)
set_var              Used by phpbb_http_login
			and phpbb\auth\provider\apache::autologin

PHPBB3-12199
2014-04-26 01:25:51 +02:00
Nicofuma
5ec9f40b78 [ticket/12445] Disapproved post: the name of the poster should be in logs
https://tracker.phpbb.com/browse/PHPBB3-12445

PHPBB3-12445
2014-04-26 01:18:34 +02:00
Joas Schilling
b32895308d [ticket/12273] Update since version to 3.1.0-a* style
PHPBB3-12273
2014-04-25 12:15:44 +02:00
Joas Schilling
40d91a5d6e [ticket/12371] Delete the approve_post notification when editing a post
We need to delete the initial approve notification,
so we can notify the user again, when his post got reapproved.

PHPBB3-12371
2014-04-25 11:52:28 +02:00
Joas Schilling
ddbb521e57 [ticket/12371] Correctly set is_starter when editing first post of the topic
PHPBB3-12371
2014-04-25 11:52:26 +02:00
Joas Schilling
8375c3f789 [ticket/12371] Fix SQL query
PHPBB3-12371
2014-04-25 11:52:23 +02:00
Joas Schilling
5512e62c3c [ticket/11772] Do not send out new topic/post notifications when reapproving
Only add notifications, if we are not reapproving post
When the topic was already approved, but was edited and
now needs re-approval, we don't want to notify the users again.

PHPBB3-11772
2014-04-25 11:52:22 +02:00
Joas Schilling
2ec9c08a2b [ticket/12052] Use different visibility when post was edited
... and needs to be reapproved.

PHPBB3-12052
2014-04-25 11:52:22 +02:00
Joas Schilling
92db22c882 [ticket/12371] Do not delete post related notifications when a post is deleted
When a post is marked edited and therefor marked as softdeleted/unapproved,
we should not delete the notifications, just like we can't delete the emails.
Links are out there anyway and just keeping the notification is fail save.

If we keep the notification we can just continue to update it when more posts
are added. Also when we delete a post, we don't have to go though the table
and find all related notifications to be able to delete them or even update
them, when they have responders set.

PHPBB3-12371
2014-04-25 11:52:19 +02:00
Joas Schilling
87899b0e14 [ticket/12273] Update existing events
PHPBB3-12273
2014-04-25 11:46:44 +02:00
Joas Schilling
c2dace762e [ticket/12273] Fix long $vars lines for existing events
PHPBB3-12273
2014-04-24 17:26:27 +02:00
Nils Adermann
6e85b2acc7 Merge remote-tracking branch 'github-nickvergessen/ticket/11917' into develop-ascraeus
* github-nickvergessen/ticket/11917:
  [ticket/11917] Move OAuth Module to the bottom while installing
  [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend

Conflicts:
	phpBB/install/install_install.php
2014-04-24 11:33:00 +02:00
n-aleha
5a91399dac [ticket/12186] Move PM reports below post reports while installing
In mcp, move PM reports below post reports while installing.

PHPBB3-12186
2014-04-23 22:43:20 +03:00
Joas Schilling
5b6a675399 Merge pull request #2036 from prototech/ticket/12201
[ticket/12201] Clean up ACP attachment management page

* prototech/ticket/12201:
  [ticket/12201] Decreased pagination font size.
  [ticket/12201] Update select element to follow same design as prosilver.
  [ticket/12201] Increase sort font size just slightly.
  [ticket/12201] Add link to resync file stats after error.
  [ticket/12201] Fix typos in language pack.
  [ticket/12201] Display error and sorting options when there are no attachments
  [ticket/12201] Only the top pagination should be floated to the right.
  [ticket/12201] Rearrange pagination, sorting, and submit elements.
  [ticket/12201] Center the file size and mark columns.
  [ticket/12201] Separate pagination from table.
2014-04-22 19:58:15 +02:00
Joas Schilling
ed07f1b85e Merge pull request #2248 from Elsensee/ticket/12193
[ticket/12193] Fix broken HTML if SQL error occurs during migration

* Elsensee/ticket/12193:
  [ticket/12193] Fix broken HTML if SQL error occurs during migration
2014-04-22 18:25:33 +02:00
Oliver Schramm
7cccd59cdc [ticket/12193] Fix broken HTML if SQL error occurs during migration
PHPBB3-12193
2014-04-19 16:58:38 +02:00
Joas Schilling
8f57880edb [ticket/12273] Fix missing $vars line
PHPBB3-12273
2014-04-18 13:07:41 +02:00
Joas Schilling
7b53210926 [ticket/12273] Fix invalid @event and @since tags
PHPBB3-12273
2014-04-18 13:07:40 +02:00
Andreas Fischer
e9807e1741 Merge pull request #2310 from n-aleha/ticket/12397
[ticket/12397] Fix sql_unique_index_exists doc block

* n-aleha/ticket/12397:
  [ticket/12397] Fix sql_unique_index_exists doc block
2014-04-15 23:59:39 +02:00
n-aleha
bff63be512 [ticket/12397] Fix sql_unique_index_exists doc block
db_tools::sql_unique_index_exists() searches for unique indexes but not
primary key indexes.

PHPBB3-12397
2014-04-16 00:55:05 +03:00
Joas Schilling
d1f96aa036 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/10423] Replace foreach with function in viewtopic.php
  [ticket/10423] Remove unnecessary include in test
  [ticket/10423] Match multiple wildcards
  [ticket/10423] Move code into a function and add tests for it
  [ticket/10423] Remove * from search or highlight string
2014-04-15 23:23:44 +02:00
Joas Schilling
675cef9c2e Merge pull request #2195 from Elsensee/ticket/10423
[ticket/10423] Remove * from search or highlight string

* Elsensee/ticket/10423:
  [ticket/10423] Replace foreach with function in viewtopic.php
  [ticket/10423] Remove unnecessary include in test
  [ticket/10423] Match multiple wildcards
  [ticket/10423] Move code into a function and add tests for it
  [ticket/10423] Remove * from search or highlight string
2014-04-15 23:23:26 +02:00
Cesar G
b73e22ae71 [ticket/12201] Add link to resync file stats after error.
PHPBB3-12201
2014-04-15 14:19:47 -07:00
lucifer4o
84c8c61eb2 [ticket/12344] Add core.pm_submit_before to function submit_pm
PHPBB3-12344
2014-04-15 22:19:47 +02:00
Joas Schilling
aebf2cc5cd Merge remote-tracking branch 'marc/ticket/12372' into develop-ascraeus
* marc/ticket/12372:
  [ticket/12372] Use $() instead of jQuery() in core.js for toggleDisplay
  [ticket/12372] Use admin.js $(document).ready for hiding questionnaire details
  [ticket/12372] Rename JS function dE() to phpbb.toggleDisplay()
  [ticket/12372] Move dE() function core.js
  [ticket/12372] Unify definition of function dE() across all files
  [ticket/12372] Use jQuery in javascript dE() function
2014-04-14 12:33:33 +02:00
Oliver Schramm
dde7ac3b2b [ticket/10423] Match multiple wildcards
Multiple wildcards are removed from the string if there is
no word before or after them. If there is a word before or
after them, they are just replaced with a single one.

PHPBB3-10423
2014-04-13 21:36:09 +02:00
Oliver Schramm
face175471 [ticket/10423] Move code into a function and add tests for it
PHPBB3-10423
2014-04-13 21:15:14 +02:00
Joas Schilling
57146ccdd1 [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend
PHPBB3-11917
2014-04-12 11:50:54 +02:00
Marc Alexander
106be54de3 [ticket/12211] Do not run attachment file names twice through htmlspecialchars
Upload filenames are already processed via htmlspecialchars in the
type_cast_helper of the new request class. There is no need to run it through
htmlspecialchars() again in the filespec class.

PHPBB3-12211
2014-04-11 21:10:28 +02:00
Joas Schilling
13a34ce59f Merge remote-tracking branch 'rxu/ticket/12336' into develop-ascraeus
* rxu/ticket/12336:
  [ticket/12336] Add functions_module.php core event
2014-04-11 16:31:26 +02:00
Marc Alexander
03667081e1 [ticket/12386] Rename DEBUG_EXTRA to DEBUG_CONTAINER for more descriptive name
PHPBB3-12386
2014-04-11 11:11:31 +02:00
Marc Alexander
22090dc3a3 [ticket/12386] Add DEBUG_EXTRA again and use it for container creation
We are currently creating a new compiled container on every page load when
having DEBUG enabled. However, one might only have that enabled to be
presented with errors or for getting the page load stats.
This change will add the DEBUG_EXTRA constant again. It will be used for
choosing whether the compiled container should be created on every page load -
when defined as true - or just once after the cache is cleared.

PHPBB3-12386
2014-04-11 11:11:31 +02:00
Joas Schilling
b832ebe718 Merge remote-tracking branch 'vsephpbb/ticket/12380' into develop-ascraeus
* vsephpbb/ticket/12380:
  [ticket/12380] Explicity state the order of sorting for login keys
  [ticket/12380] Sort Remember Me keys by last login time in UCP
2014-04-11 10:32:53 +02:00
Nils Adermann
3f74e5b88b Merge remote-tracking branch 'github-nickvergessen/ticket/12370' into develop-ascraeus
* github-nickvergessen/ticket/12370:
  [ticket/12370] Add unit tests for topic notifications
  [ticket/12370] Fix functional notification test and remove unneeded requests
  [ticket/12370] Do not delete topic notifications when the topic is visible
2014-04-10 14:26:41 -07:00
Nils Adermann
497d81af68 Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into develop-ascraeus
* github-nickvergessen/ticket/12113:
  [ticket/12113] Fix view_log() tests
  [ticket/12113] Correctly use plurals when deleting user warnings
  [ticket/12113] Allow log entries to use plurals
2014-04-10 14:22:36 -07:00
Nils Adermann
90ebd49a2b Merge remote-tracking branch 'github-nickvergessen/ticket/12373' into develop-ascraeus
* github-nickvergessen/ticket/12373:
  [ticket/12373] Add to and from forum_id to LOG_MOVE log entries
2014-04-10 14:19:13 -07:00
Nils Adermann
7a947b247d Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into develop-ascraeus
* github-nickvergessen/ticket/12282:
  [ticket/12282] Update new references
  [ticket/12282] Update container db mock
  [ticket/12282] Add new line at EOF of the interface
  [ticket/12282] Use interface for type hinting
  [ticket/12282] Use {@inheritDoc} for inherited methods
  [ticket/12282] Add Interface for DBAL drivers
2014-04-10 14:04:43 -07:00
Nils Adermann
79fe781629 Merge remote-tracking branch 'github-nickvergessen/ticket/11352' into develop-ascraeus
* github-nickvergessen/ticket/11352:
  [ticket/11352] Add functional tests for disapproving a post/topic
  [ticket/11352] Redirect the user back to view*.php after disapproving
2014-04-10 13:56:30 -07:00
Matt Friedman
eb6b877330 [ticket/12380] Explicity state the order of sorting for login keys
PHPBB3-12380
2014-04-10 09:10:01 -07:00
Matt Friedman
49885e55e7 [ticket/12380] Sort Remember Me keys by last login time in UCP
PHPBB3-12380
2014-04-10 09:04:35 -07:00
Joas Schilling
377fb770fb Merge remote-tracking branch 'vsephpbb/ticket/11098' into develop-ascraeus
* vsephpbb/ticket/11098:
  [ticket/11098] Fix error reporting on the autologin key pages
  [ticket/11098] Update subsilver2 to also include mark/unmark all buttons
  [ticket/11098] HTML Validity fix to Notifications in UCP
  [ticket/11098] Add mark/unmark all options to remember me keys
2014-04-10 12:08:01 +02:00
Matt Friedman
80bc30214f [ticket/11098] Fix error reporting on the autologin key pages
PHPBB3-11098
2014-04-09 23:17:30 -07:00