1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

712 Commits

Author SHA1 Message Date
rechosen
e45b69ee09 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786 2013-09-23 18:08:29 +02:00
rechosen
3dfad1f01e [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
To allow extra fields added to the query retrieving post data to be used for
setting template variables, they need to be added to the post rowset. This
commit adds the core.viewtopic_post_rowset_data event that enables extension
developers to modify the post rowset when the database row is still available.

PHPBB3-9550
2013-09-06 15:04:52 +02:00
rechosen
e2014ab76e [ticket/11786] Fix PHPDoc documentation of a few events
Fixed some PHPDoc errors I noticed while working on the karma extension.
Mostly spacing issues or omitted characters, though there was one description
that made no sense at all.

PHPBB3-11786
2013-08-13 16:23:54 +02:00
Joas Schilling
b4e043ba15 Merge pull request #1630 from brunoais/ticket/11638
[ticket/11638] Variable names goof...
2013-07-30 03:27:22 -07:00
Bruno Ais
8295d0fb36 [ticket/11638] Variable names goof...
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-30 11:15:46 +01:00
Joas Schilling
49d908e959 Merge pull request #1624 from brunoais/ticket/11638
[ticket/11638] Changed the layout to match the other similar commits
2013-07-29 09:09:07 -07:00
Bruno Ais
ccc5c5f6b8 [ticket/11638] Changed the layout to match the other similar commits
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-29 17:00:51 +01:00
Nathan Guse
7027610e23 Merge pull request #1542 from brunoais/ticket/11638
[ticket/11638] generate_text_for_display on viewtopic.php
2013-07-29 07:42:32 -07:00
Bruno Ais
4cdccbd42b [ticket/11638] Removed the unneeded reset.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 12:45:23 +01:00
Bruno Ais
6c68348a71 [ticket/11638] Use the $parse_flags like the other commits
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 12:31:38 +01:00
Bruno Ais
029015e154 [ticket/11638] Reverted to use the $parse tags way as the other ones
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 12:31:14 +01:00
Bruno Ais
4ed322b5b8 [ticket/11638] Updated: bitwise $parse_flags use optionset()
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-24 11:59:28 +01:00
Bruno Ais
7341482304 [ticket/11638] Fixed not following guidelines for brackets
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-20 16:25:05 +01:00
Bruno Ais
fc64e6997f [ticket/11638] Fixed typo in the variable name.
sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-20 16:24:31 +01:00
Bruno Ais
713a2ba573 [ticket/11638] generate_text_for_display on viewtopic.php
lines: 1403-1417

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-13 16:57:00 +01:00
Bruno Ais
a58ccdabf3 [ticket/11638] generate_text_for_display on viewtopic.php
lines: 1395-1403

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-13 16:55:36 +01:00
Bruno Ais
97054d81f8 [ticket/11638] generate_text_for_display on viewtopic.php
lines: 846-854

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-13 16:39:29 +01:00
Bruno Ais
b4fcdc51e9 [ticket/11638] generate_text_for_display on viewtopic.php
lines: 835-843

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
2013-07-13 16:38:51 +01:00
Joas Schilling
8352a7cada Merge remote-tracking branch 'phpbb/develop' into ticket/9657
* phpbb/develop: (216 commits)
  [ticket/11626] Remove last reference to template in ldap
  [ticket/11626] Remove LDAP dependency on template
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.
  [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
  [ticket/11668] Run lint test at the end of the test suite
  [ticket/11548] Fix test errors in groups test on develop
  [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
  [ticket/11548] Fix incorrect usage of array_map on acp groups page
  [ticket/11665] Fix test class name
  [ticket/11664] Stop creating php.html file in root path in tests
  [ticket/11665] Can't change file names already sent to set_filenames
  [ticket/11662] Typos: occured -> occurred
  [ticket/11662] Typos: occured -> occurred
  [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
  [feature/auth-refactor] Add parent::setUp() in setUp()
  [feature/auth-refactor] Changes
  [feature/auth-refactor] DataProvider for acp_board test
  ...
2013-07-13 09:36:24 -04:00
Joas Schilling
5ab0090e6c [ticket/9657] Remove sql_visibility as it is always non-empty
PHPBB3-9657
2013-07-11 22:35:55 -04:00
Nathaniel Guse
7104aeb77e Merge branch 'develop-olympus' into develop
# By Vjacheslav Trushkin
# Via Nathaniel Guse (1) and Vjacheslav Trushkin (1)
* develop-olympus:
  [ticket/10772] Remove unnecessary comment
  [ticket/10772] Functional tests for forum style

Conflicts:
	tests/functional/forum_style_test.php
2013-07-11 13:15:26 -05:00
Joas Schilling
9aed758c13 [ticket/9657] Use the service instead of the static class
PHPBB3-9657
2013-07-11 14:24:07 +02:00
Vjacheslav Trushkin
1ea1247cd5 [ticket/10772] Remove unnecessary comment
PHPBB3-10772
2013-05-16 09:34:58 +03:00
Vjacheslav Trushkin
f3c547bc8d Merge branch 'ticket/10772' into ticket/develop/10772
* ticket/10772:
  [ticket/10772] Use forum specific style for trigger_error
2013-05-12 12:42:22 +03:00
Vjacheslav Trushkin
170333a6fc [ticket/10772] Use forum specific style for trigger_error
PHPBB3-10772
2013-05-11 22:49:42 +03:00
Joas Schilling
5da250148b [ticket/9657] Finish subsilver2 viewforum and viewtopic
PHPBB3-9657
2013-03-12 09:14:39 +01:00
Joas Schilling
cd95d3abf7 [ticket/9657] Include poster name in "deleted post" message
Also switched from passive to active form

PHPBB3-9657
2013-03-11 12:22:47 +01:00
Joas Schilling
f5482e73fd [ticket/9657] Correctly return to viewtopic page when handling posts
While managing posts from viewtopic.php we should return to that page,
rather then the MCP

PHPBB3-9657
2013-03-06 13:05:33 +01:00
Joas Schilling
164a06c066 [ticket/9657] Fix "Display this post" link if javascript is disabled
PHPBB3-9657
2013-03-06 13:05:33 +01:00
Joas Schilling
923c0709db Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: (234 commits)
  [ticket/11398] Correctly call permission_set method in permission tool
  [ticket/11394] Relax Migration Tools
  [ticket/11386] Fix missing ;
  [ticket/10714] Get log from container in install, update and download/file
  [feature/avatars] Update module_auth of ucp module and fix small issues
  [ticket/11396] Rename insert_migration to set_migration_state
  [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
  [ticket/11393] Give more information on database updater
  [ticket/11386] Send list of migrations instead of using load_migrations
  [feature/avatars] Add migrations data file for avatars
  [feature/avatars] Reduce module auth of ucp avatar settings
  [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
  [ticket/10714] Logs are disabled for this page call only
  [ticket/10411] Fix call to function on non-object $db->...()
  [ticket/10411] Remove ajax delete, so the page is refreshed
  [feature/avatars] Auto-clear avatar dimensions when first changing avatars
  [ticket/10411] Update schema file with new table and remove the column
  [ticket/10411] Add unit tests for move() with values >1
  [ticket/10411] Add migrations file for teampage table
  [ticket/10411] Revert database_update.php changes from for easier update
  ...
2013-03-05 18:26:01 +01:00
Marc Alexander
7256a2d944 [feature/avatars] Add phpbb prefix to new functions
Although get_user_avatar() is not new, the phpbb prefix was prepended. This
is due to the fact that it was entirely rewritten and is therefore more or
less a completely new function.

PHPBB3-10018
2013-01-04 15:10:43 +01:00
Marc Alexander
c9338b38b3 Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatars 2012-12-24 14:34:10 +01: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
David King
53c4a328a6 [ticket/11243] Show download all link on all pages of topic with attachments
PHPBB3-11243
2012-12-11 11:42:34 -05:00
Marc Alexander
2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars
Conflicts:
	phpBB/adm/style/acp_groups.html
	phpBB/adm/style/acp_users_avatar.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_display.php
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-11-12 14:57:28 +01:00
Joas Schilling
1c584ef8ba [feature/soft-delete] Use JS to display softdeleted/ignored posts
PHPBB3-9567
2012-11-09 11:46:17 +01:00
Joas Schilling
334265fc83 [feature/soft-delete] Fix displaying the button/permission
When the post is already softdeleted the options should only be available if
*_delete is granted.

PHPBB3-9567
2012-11-03 22:57:49 +01:00
Joas Schilling
4a8d38aab1 [feature/soft-delete] Allow soft deleting/restoring topics via quickmoderation
PHPBB3-9567
2012-10-27 17:12:34 +02:00
Joas Schilling
7b3d794cad [feature/soft-delete] Display post delete reason if one is given
PHPBB3-9567
2012-10-24 19:58:28 +02:00
Joas Schilling
9945561b4b [feature/soft-delete] Correctly calculate the number of replies everywhere
PHPBB3-9567
2012-10-22 11:14:00 +02:00
Joas Schilling
a58a76ef5f [feature/soft-delete] Fix permission check in viewtopic.php
PHPBB3-9567
2012-10-15 13:17:05 +02:00
Joas Schilling
a1e0690b6b [feature/soft-delete] Simplification part2: user can see all item visibilities
If the user can see all visibilities, we can simply leave out the query part,
instead of adding a bunch of ANDs.

PHPBB3-9657
2012-08-29 22:12:33 +02:00
Joas Schilling
d9a93a9cdc [feature/soft-delete] Fix missing AND in query
PHPBB3-9657
2012-08-29 17:50:14 +02:00
Josh Woody
1ab41f8dc6 [feature/soft-delete] Fix some small bugs
To wit: using non-existing constant POST_DELETED in posting.php; first test
post was initially unapproved; soft delete checkbox appeared at post time
Links pointing to the wrong place.

PHPBB3-9657
2012-08-29 17:50:12 +02:00
Josh Woody
a80cfafdd9 [feature/soft-delete] Rename phpbb_visibility class to phpbb_content_visibility
Rename the class to more accurately reflect what it does.

PHPBB3-9657
2012-08-29 17:50:11 +02:00
Josh Woody
fb13ab83e4 [feature/soft-delete] Implement the ability to soft-delete and restore posts
The soft delete feature seems to work.  Tests are pending.  A real icon is pending.  Add the permissions and the interface to soft-delete posts.  Also able to restore posts via the MCP queue

PHPBB3-9657
2012-08-29 17:50:11 +02:00
Josh Woody
c32d760806 [feature/soft-delete] I told you I was going to rename the class!
Rename topic_visibility class to phpbb_visibility. Also a bit of work to the class itself, mostly cleanup and adding the comments that I'd previously written.

PHPBB3-9657
2012-08-29 17:49:38 +02:00
Josh Woody
b8c55291ed [feature/soft-delete] Lay the groundwork for a soft-delete feature
So far, I've added no new functionality.  The biggest change here is adjusting the DB column names to "visibility" rather than "approved".  Some things here are pretty likely to change, for example the name and location of the topic_visibility class. Happy birthday phpBB :)

PHPBB3-9657
2012-08-29 17:49:37 +02:00
Andreas Fischer
d0ce637251 Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop
* Fyorl/feature/attach-dl: (75 commits)
  [feature/attach-dl] Removed the use of some abbreviations
  [feature/attach-dl] Changed $files_added checks
  [feature/attach-dl] Renamed $post_id to $post_msg_id
  [feature/attach-dl] Fixed a comment
  [feature/attach-dl] Optimised an sql query
  [feature/attach-dl] Fixed the logic in an sql statement
  [feature/attch-dl] $forum_id cast to int
  [feature/attach-dl] Fixed $file_added to $files_added
  [feature/attach-dl] Moved definition of $archive_name
  [feature/attach-dl] Swapped the order of an if statement
  [feature/attach-dl] Cast variables to int
  [feature/attach-dl] Added $archive_path
  [feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma
  [feature/attach-dl] Renamed $count to $files_added
  [feature/attach-dl] Removed sprintf() use
  [feature/attach-dl] Removed need for array_keys()
  [feature/attach-dl] Added multiple attachment downloads to PMs
  [feature/attach-dl] Removed reliance on current($row)
  [feature/attach-dl] Renamed to phpbb_download_handle_forum_auth
  [feature/attach-dl] Moved PM authentication handling into own function
  ...
2012-08-26 18:56:09 +02:00
Fyorl
e1a4aa3ea2 [feature/attach-dl] Removed the use of some abbreviations
PHPBB3-11042
2012-08-20 21:52:42 +01:00