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

14099 Commits

Author SHA1 Message Date
Joas Schilling
a84e4029e4 [feature/soft-delete] Update doc blocks to proper format
PHPBB3-9657
2012-10-02 12:51:59 +02:00
Joas Schilling
b629b2cd95 [feature/soft-delete] Add unit tests for get_global_visibility_sql()
PHPBB3-9657
2012-10-01 22:44:39 +02:00
Joas Schilling
4a65940e62 [feature/soft-delete] Add unit tests for get_forums_visibility_sql()
PHPBB3-9657
2012-10-01 22:14:04 +02:00
Joas Schilling
280619eea9 [feature/soft-delete] Add unit tests for get_visibility_sql()
PHPBB3-9657
2012-10-01 17:13:15 +02:00
Joas Schilling
38d83da69e [feature/soft-delete] Remove old unit tests
PHPBB3-9657
2012-10-01 16:38:28 +02:00
Joas Schilling
1943de36f3 [feature/soft-delete] Comment out user_posts update for the moment
It should rely on the permissions of the post not the current user.

PHPBB3-9657
2012-10-01 16:25:05 +02:00
Joas Schilling
e5377e98c7 [feature/soft-delete] Allow setting the visibility change reason
PHPBB3-9657
2012-09-28 16:53:38 +02:00
Joas Schilling
dc2835af78 [feature/soft-delete] Add columns for soft delete details
PHPBB3-9657
2012-09-28 16:17:21 +02:00
Joas Schilling
8b2181eb85 [feature/soft-delete] Comment out stuff about f_restore for performance reason
PHPBB3-9657
2012-09-28 16:14:44 +02:00
Joas Schilling
3bc3cf6e00 [feature/soft-delete] Update column names in update script and add permissions
PHPBB3-9657
2012-08-30 23:05:28 +02:00
Joas Schilling
c03d692a98 [feature/soft-delete] Fix some more usages of _approved column names
PHPBB3-9657
2012-08-30 22:57:00 +02:00
Joas Schilling
625e7ef58a [feature/soft-delete] Update development scripts with new column names
PHPBB3-9657
2012-08-30 22:54:24 +02:00
Joas Schilling
a6d3432f8b [feature/soft-delete] Update search to use $post_visibility
Todo: Sphinx currently does not respect this setting at all.

PHPBB3-9657
2012-08-30 22:20:52 +02:00
Joas Schilling
5b54ec2d64 [feature/soft-delete] Try to fix search.php
at least it's running now, but the performance is not very good.

PHPBB3-9657
2012-08-30 19:47:16 +02:00
Joas Schilling
1c043254c0 [feature/soft-delete] Add get_visibility_sql_forums based on global
The resulting query is 4-times faster, as the forum_id IN () arrays are
smaller and we need less AND/OR to build the hole query. The main difference
between those two functions is, that this one takes an array of included ids and
the _global one takes an array of excluded ids.

PHPBB3-9657
2012-08-30 18:07:00 +02:00
Joas Schilling
df83f22b71 [feature/soft-delete] Fix copy-paste fail for database update on the index
PHPBB3-9657
2012-08-30 16:21:27 +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
44ed05f567 [feature/soft-delete] Simplify the query output if the user has m_restore
PHPBB3-9657
2012-08-29 19:30:33 +02:00
Joas Schilling
36c9f6aa87 [feature/soft-delete] Update posts and topics table with database_update.php
PHPBB3-9657
2012-08-29 19:11:33 +02:00
Joas Schilling
8a036fa3e4 [feature/soft-delete] Update restoring feature to use ajax if requested.
Also fixes the mcp as a hole:
- displayes a success message
- gives a link to the post, if only one was restored

PHPBB3-9657
2012-08-29 18:42:14 +02:00
Joas Schilling
b774c09c7f [feature/soft-delete] Use the variable which holds the correct item status
PHPBB3-9657
2012-08-29 17:50:14 +02:00
Joas Schilling
d9a93a9cdc [feature/soft-delete] Fix missing AND in query
PHPBB3-9657
2012-08-29 17:50:14 +02:00
Joas Schilling
910f1602cd [feature/soft-delete] Fix displaying of "deleted post" note in viewtopic
PHPBB3-9657
2012-08-29 17:50:14 +02:00
Joas Schilling
9300ff4c6e [feature/soft-delete] Remove imageset/ which was created by merge conflict
We don't have imagesets in 3.1 anymore.

PHPBB3-9657
2012-08-29 17:50:13 +02:00
Joas Schilling
9abfba5191 [feature/soft-delete] Fix the schema files to the correct line ends again
PHPBB3-9657
2012-08-29 17:50:13 +02:00
Joas Schilling
1935568c3e [feature/soft-delete] Fix typo in column name topic_visibility
PHPBB3-9657
2012-08-29 17:50:13 +02:00
Joas Schilling
5ff35ccf72 [feature/soft-delete] Use autoloading for content_visibility class
PHPBB3-9657
2012-08-29 17:50:12 +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
f570558a8d [feature/soft-delete] Add a processor for action == restore in mcp_queue.php
Restoring a post within mcp_queue.php didn't do anything before this commit.  Now it does, by way of a function which is very similar to approve_post.

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
6739375135 [feature/soft-delete] Add unit tests for the phpbb_visibility class
Add unit tests for the phpbb_visibility class.  Adjust the phpbb_visibility class to pass those unit tests.  The changes are pretty small, actually.

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
244f6e2ddc [feature/soft-delete] Correct some mistakes in e8d47
Notably: Uncomment the die() in create_schema_files, and add the class that makes everything tick.

PHPBB3-9657
2012-08-29 17:49:37 +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
1128ff1e58 Merge remote-tracking branch 'mvinny/ticket/11065' into develop
* mvinny/ticket/11065:
  [ticket/11065] Close li tag on topic display options at MCP
2012-08-27 01:35:46 +02:00
Vinny
7cf49a810f [ticket/11065] Close li tag on topic display options at MCP
PHPBB3-11065
2012-08-26 20:24:53 -03: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
Nils Adermann
18039cfa6a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.php
2012-08-26 15:22:12 +02:00
Nils Adermann
4db4731fff Merge remote-tracking branch 'github-bantu/ticket/11066' into develop-olympus
* github-bantu/ticket/11066:
  [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.php
2012-08-26 15:22:04 +02:00
Nils Adermann
90d26bb946 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11060] Backport ca4cee86afb88820a52ac1535de18c4dbb365f0e to olympus.

Conflicts:
	.travis.yml
2012-08-26 15:20:04 +02:00
Nils Adermann
a3d87a1443 Merge remote-tracking branch 'github-bantu/ticket/11060' into develop-olympus
* github-bantu/ticket/11060:
  [ticket/11060] Backport ca4cee86afb88820a52ac1535de18c4dbb365f0e to olympus.
2012-08-26 15:16:08 +02:00
Andreas Fischer
5407f9b00d [ticket/11060] Backport ca4cee86afb88820a52ac1535de18c4dbb365f0e to olympus.
PHPBB3-11060
2012-08-26 15:09:00 +02:00
Jordan Rogers
73cd044f5c [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.php
For some reason, all errors are just flipped on before connecting to the
database, despite the system as a whole having a different setting for
displayable errors. Had to add & ~E_STRICT in PHP 5.4.5 to suppress Strict
Standards messages, but I would assume that the db piece shouldn't be involved
with setting error_reporting at all.

PHPBB3-11066
2012-08-23 15:41:57 +02:00
Fyorl
e1a4aa3ea2 [feature/attach-dl] Removed the use of some abbreviations
PHPBB3-11042
2012-08-20 21:52:42 +01:00
Fyorl
b1239f1c1a [feature/attach-dl] Changed $files_added checks
PHPBB3-11042
2012-08-20 21:47:29 +01:00
Andreas Fischer
bfdba90a34 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.

Conflicts:
	phpBB/install/database_update.php
2012-08-20 16:42:41 +02:00
Andreas Fischer
446607ef53 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2012-08-20 16:40:50 +02:00
Andreas Fischer
6da03913bf [prep-release-3.0.11] Bumping version number for 3.0.11 final. 2012-08-20 16:32:34 +02:00
David King
310c906932 Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00