New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ticket/16193] Re-implement drafts #5759

Open

v12mike wants to merge 5 commits into phpbb:3.3.x from v12mike:ticket/16193

Contributor

v12mike commented Nov 30, 2019 •

edited by hanakin

rebased to 3.3.x

PHPBB3-16193

Checklist:

Correct branch: master for new features; 3.3.x & 3.2.x for fixes
Tests pass
Code follows coding guidelines: master, 3.3.x and 3.2.x
Commit follows commit message format

Tracker ticket (set the ticket ID to your ticket ID):

https://tracker.phpbb.com/browse/PHPBB3-16193

v12mike added 3 commits

November 30, 2019 14:56


          [ticket/16193] Re-implement drafts

c41f7f4

rebased to 3.3.x

PHPBB3-16193


          [ticket/16193] Re-implement drafts

Fix indentation

PHPBB3-16193


          [ticket/16193] Re-implement drafts

Fix indentation

PHPBB3-16193

marc1706 added the 4.0 (Triton) 🔮 label

Member

marc1706 commented Dec 6, 2019

I have assigned this the 4.0 label as I don't think we'll be able to merge this refactoring into 3.3 due to the rather short time we have before its RC and stable release.

Contributor Author

v12mike commented Dec 6, 2019

I have assigned this the 4.0 label as I don't think we'll be able to merge this refactoring into 3.3 due to the rather short time we have before its RC and stable release.

Does "4.0" mean 4.0, or something after 3.3.0?

koraldon commented Dec 6, 2019

Will be great if it can happen for 3.3 😇 seems like a small but very good feature

SiteSplat commented Dec 6, 2019

It means 4.0... https://github.com/phpbb/phpbb/labels/4.0%20%28Proteus%29%20%F0%9F%94%AE

koraldon commented May 3, 2020

Seeing that font awesome was merged into 3.3, any chance to see this as well?

ghost commented May 3, 2020 •

edited by ghost

I'll see if I can review this aswell.
As it stands though, this PR has conflicts that need to be resolved.
If you need assistance with resolving conflicts, please let us know.

Contributor Author

v12mike commented May 3, 2020 •

edited

I should be able to fix the conflicts in a day or two...

This PR is currently against the 3.3.x branch.

ghost suggested changes

View reviewed changes

ghost left a comment

This too is a rather large, large PR, that will require a lot of testing on local environments too.
A lot of new functionalities and changes to existing ones..
Not a big fan of how drafts will be handled, where they take presedence over a lot of other common actions, eg: if ($visibility == ITEM_DRAFT) { ... } else { // Everything else, like a regular post }. Not to mention the amount of additional nested conditionals.

phpBB/includes/functions_posting.php

    
            @@ -1138,7 +1009,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
          
              			'S_HAS_ATTACHMENTS'	=> (!empty($attachments[$row['post_id']])) ? true : false,

              			'S_FRIEND'			=> ($row['friend']) ? true : false,

              			'S_IGNORE_POST'		=> ($row['foe']) ? true : false,

              			'L_IGNORE_POST'		=> ($row['foe']) ? sprintf($user->lang['POST_BY_FOE'], get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), "<a href=\"{$u_show_post}\" onclick=\"phpbb.toggleDisplay('{$post_anchor}', 1); return false;\">", '</a>') : '',

              			'L_IGNORE_POST'		=> ($row['foe']) ? sprintf($user->lang['POST_BY_FOE'], get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), "<a href=\"{$u_show_post}\" onclick=\"phpbb.toggleDisplay('{$post_anchor}',	1);	return	false;\">",	'</a>')	:	'',

ghost May 4, 2020

Why are these changed to tabs?

phpBB/includes/functions_posting.php

    
            @@ -1564,7 +1445,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll_ary, &$data
          
              	}

              	else if ($mode == 'edit')

              	{

              		$post_mode = ($data_ary['topic_posts_approved'] + $data_ary['topic_posts_unapproved'] + $data_ary['topic_posts_softdeleted'] == 1) ? 'edit_topic' : (($data_ary['topic_first_post_id'] == $data_ary['post_id']) ? 'edit_first_post' : (($data_ary['topic_last_post_id'] == $data_ary['post_id']) ? 'edit_last_post' : 'edit'));

              		$post_mode = ($data_ary['topic_posts_approved'] + $data_ary['topic_posts_unapproved'] + $data_ary['topic_posts_softdeleted'] == 1) ? 'edit_topic' : (($data_ary['topic_first_post_id'] == $data_ary['post_id']) ? 'edit_first_post' : (($data_ary['topic_last_post_id']	==	$data_ary['post_id'])	?	'edit_last_post'	:	'edit'));

ghost May 4, 2020

Why are these changed to tabs?

phpBB/includes/functions_posting.php

-              		$data_ary['topic_visibility'] = $topic_row['topic_visibility'];
-              		$data_ary['post_visibility'] = $topic_row['post_visibility'];
+              		$post_visibility = ITEM_DRAFT;

ghost May 4, 2020

What's the point of this variable as it is immediately overwritten by ITEM_APPROVED?

phpBB/includes/functions_posting.php

               	{
               		$post_visibility = (in_array((int) $data_ary['force_visibility'], array(ITEM_APPROVED, ITEM_UNAPPROVED, ITEM_DELETED, ITEM_REAPPROVE))) ? (int) $data_ary['force_visibility'] : $post_visibility;
               	}
+              	}

ghost May 4, 2020

Everything above is not properly indented.

phpBB/includes/functions_posting.php

-              	// Delete draft if post was loaded...
-              	$draft_id = $request->variable('draft_loaded', 0);
-              	if ($draft_id)
+              	if ($data_ary['post_visibility'] != ITEM_DRAFT)

ghost May 4, 2020

Missing an emtpy line

phpBB/posting.php

@@ @@ -494,6 +496,11 @@ @@
               		$user->setup('posting');
               		trigger_error('NO_POST');
               	}
+              	if ($mode == 'soft_delete' && $post_data['post_visibility'] == ITEM_DRAFT)

ghost May 4, 2020

New line before an if block.

phpBB/search.php

+              	// Egosearch and draftsearch are author searches
+              	case 'draftsearch':
+              		$target_visibility = ITEM_DRAFT;
+              		// deliberate drop-through

ghost May 4, 2020

// no break is used throughout

phpBB/search.php

@@ @@ -1094,7 +1104,7 @@ @@
               				$topic_unapproved = (($row['topic_visibility'] == ITEM_UNAPPROVED || $row['topic_visibility'] == ITEM_REAPPROVE) && $auth->acl_get('m_approve', $forum_id)) ? true : false;
               				$posts_unapproved = ($row['topic_visibility'] == ITEM_APPROVED && $row['topic_posts_unapproved'] && $auth->acl_get('m_approve', $forum_id)) ? true : false;
               				$topic_deleted = $row['topic_visibility'] == ITEM_DELETED;
-              				$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&amp;t=$result_topic_id", true, $user->session_id) : '';
+              				$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&amp;t=$result_topic_id", true, $user->session_id) :	'';

ghost May 4, 2020

Why is this changed?

phpBB/styles/prosilver/template/posting_pm_header.html

		@@ -1,6 +1,4 @@
		<fieldset class="fields1">
		<!-- IF not S_SHOW_DRAFTS -->

ghost May 4, 2020

This entire file now has incorrect indentations.

phpBB/styles/prosilver/template/search_results.html

               			<dt class="author">{L_POST_BY_AUTHOR} <!-- EVENT search_results_post_author_username_prepend -->{searchresults.POST_AUTHOR_FULL}<!-- EVENT search_results_post_author_username_append --></dt>
               			<dd class="search-result-date">{searchresults.POST_DATE}</dd>
               			<dd>{L_FORUM}{L_COLON} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a></dd>
+                      <!-- IF searchresults.TOPIC_REPLIES >= 0 -->

ghost May 4, 2020

Wrong indentation and should use twig syntax for newly added template code.
The twig syntax also applies to a lot more files.

v12mike added 2 commits

May 5, 2020 04:45


          [ticket/16193] merge from phpbb 3.3.x

e14e385

Merge branch '3.3.x' of https://github.com/phpbb/phpbb into ticket/16193

PHPBB3-16193


          [ticket/16193]

ed97581

Merge branch '3.3.x' of https://github.com/phpbb/phpbb into ticket/16193
PHPBB3-16193

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment