Merge lp:~quam-plures-core/quam-plures/bug-566226.tblue into lp:quam-plures

[Tilman Blumenbach]

This fixes bug 566226 by refactoring the preview code. It has gone from horrible to ugly, and that's an improvement!

[lp:~quam-plures-core/quam-plures/bug-566226.tblue]

7465. By Tilman Blumenbach on 2010-04-19

Reverted useless fixing attempt

7466. By Tilman Blumenbach on 2010-04-19

[Minor] Fixed typo in comment

[EdB (edb)]

Will grab branch later today (local time of course) and give it a test run. Actually, I'll get the branch now and test it when I get back home :)

[EdB (edb)]

Yay! Will merge inaminitor2 cuz that's the way I roll

review: Approve

[EdB (edb)]

I think I broke something :(

It's been an hour and (a) this branch didn't figure out to get out of the "request to merge" section and (b) https://code.launchpad.net/~quam-plures-gatekeepers/quam-plures/trunk is still saying "updating branch blah blah blah reload in a few minutes".

Ruh roh!

[Tilman Blumenbach (tblue)]

I fixed it for you.

=== modified file 'inc/_core/_template.funcs.php'
--- inc/_core/_template.funcs.php	2010-03-30 19:16:12 +0000
+++ inc/_core/_template.funcs.php	2010-04-19 16:19:23 +0000
@@ -884,7 +884,7 @@
 	{
 		$Item = & $MainList->get_item();
 
-		if( $Item && $Item->ID == $featured_displayed_item_ID )
+		if( $Item && $Item->ID === $featured_displayed_item_ID )
 		{	// This post was already displayed as a Featured post, let's skip it and get the next one:
 			$Item = & $MainList->get_item();
 		}

=== modified file 'inc/items/model/_itemlist.class.php'
--- inc/items/model/_itemlist.class.php	2010-02-19 10:50:37 +0000
+++ inc/items/model/_itemlist.class.php	2010-04-19 16:19:23 +0000
@@ -82,131 +82,53 @@
 	 */
 	function preview_from_request()
 	{
-		global $current_User;
+		global $current_User, $Plugins, $Messages, $localtimenow;
+		global $post_category, $post_extracats, $post_status;
 
 		if( empty($current_User) )
 		{ // dh> only logged in user's can preview. Alternatively we need those checks where $current_User gets used below.
 			return;
 		}
 
-		global $DB, $localtimenow, $Messages, $BlogCache;
-		global $Plugins;
-
-		$preview_userid = param( 'preview_userid', 'integer', true );
-		$post_status = param( 'post_status', 'string', true );
-		$post_locale = param( 'post_locale', 'string', $current_User->locale );
-		$content = param( 'content', 'html', true );
-		$post_title = param( 'post_title', 'html', true );
-		$post_titletag = param( 'titletag', 'string', true );
-		$post_metadesc = param( 'metadesc', 'string', true );
-		$post_metakeywords = param( 'metakeywords', 'string', true );
-		$post_excerpt = param( 'post_excerpt', 'string', true );
-		$post_url = param( 'post_url', 'string', '' );
-		$post_category = param( 'post_category', 'integer', true );
-		$post_views = param( 'post_views', 'integer', 0 );
-		$renderers = param( 'renderers', 'array', array('default') );
-		if( ! is_array($renderers) )
-		{ // dh> workaround for param() bug. See rev 1.93 of /inc/_misc/_misc.funcs.php
-			$renderers = array('default');
-		}
-		$comment_Blog = & $BlogCache->get_by_ID( get_catblog( $post_category ) );
-		if( $comment_Blog->allowcomments == 'post_by_post' )
-		{ // param is required
-			$post_comment_status = param( 'post_comment_status', 'string', true );
-		}
-		else
-		{
-			$post_comment_status = $comment_Blog->allowcomments;
-		}
-
-
-		// Get issue date, using the user's locale (because it's entered like this in the form):
-		locale_temp_switch( $current_User->locale );
-
-		param_date( 'item_issue_date', T_('Please enter a valid issue date.'), false );
-		// TODO: dh> get_param() is always true here, also on invalid dates:
-		if( strlen(get_param('item_issue_date')) )
-		{ // only set it, if a date was given:
-			param_time( 'item_issue_time' );
-			$item_issue_date = form_date( get_param( 'item_issue_date' ), get_param( 'item_issue_time' ) ); // TODO: cleanup...
-		}
-		else
-		{
-			$item_issue_date = date( 'Y-m-d H:i:s', $localtimenow );
-		}
-		locale_restore_previous();
-
-
-		if( !($item_typ_ID = param( 'item_typ_ID', 'integer', NULL )) )
-			$item_typ_ID = NULL;
-		if( !($item_st_ID = param( 'item_st_ID', 'integer', NULL )) )
-			$item_st_ID = NULL;
-		if( !($item_assigned_user_ID = param( 'item_assigned_user_ID', 'integer', NULL )) )
-			$item_assigned_user_ID = NULL;
-		if( !($item_deadline = param( 'item_deadline', 'string', NULL )) )
-			$item_deadline = NULL;
-		$item_priority = param( 'item_priority', 'integer', NULL ); // QUESTION: can this be also empty/NULL?
-
-		// Do some optional filtering on the content
-		// Typically stuff that will help the content to validate
-		// Useful for code display.
-		// Will probably be used for validation also.
-		$Plugins_admin = & get_Cache('Plugins_admin');
-		$Plugins_admin->filter_contents( $post_title /* by ref */, $content /* by ref */, $renderers );
-
-		$post_title = format_to_post( $post_title );
-		$content = format_to_post( $content );
-
-
-		$this->sql = "SELECT
-			0 AS post_ID,
-			$preview_userid AS post_creator_user_ID,
-			$preview_userid AS post_lastedit_user_ID,
-			'$item_issue_date' AS post_datestart,
-			'$item_issue_date' AS post_datecreated,
-			'$item_issue_date' AS post_datemodified,
-			'".$DB->escape($post_status)."' AS post_status,
-			'".$DB->escape($post_locale)."' AS post_locale,
-			'".$DB->escape($content)."' AS post_content,
-			'".$DB->escape($post_title)."' AS post_title,
-			'".$DB->escape($post_titletag)."' AS post_titletag,
-			'".$DB->escape($post_metadesc)."' AS post_metadesc,
-			'".$DB->escape($post_metakeywords)."' AS post_metakeywords,
-			'".$DB->escape($post_excerpt)."' AS post_excerpt,
-			NULL AS post_urltitle,
-			'".$DB->escape($post_url)."' AS post_url,
-			$post_category AS post_main_cat_ID,
-			$post_views AS post_views,
-			'' AS post_flags,
-			'noreq' AS post_notifications_status,
-			NULL AS post_notifications_ctsk_ID,
-			".bpost_count_words( $content )." AS post_wordcount,
-			".$DB->quote($post_comment_status)." AS post_comment_status,
-			'".$DB->escape( implode( '.', $renderers ) )."' AS post_renderers,
-			".$DB->quote($item_assigned_user_ID)." AS post_assigned_user_ID,
-			".$DB->quote($item_typ_ID)." AS post_ptyp_ID,
-			".$DB->quote($item_st_ID)." AS post_pst_ID,
-			".$DB->quote($item_deadline)." AS post_datedeadline,
-			".$DB->quote($item_priority)." AS post_priority,
-			NULL AS post_editor_code,";
-
-		$this->sql .= $DB->quote(param( 'item_order', 'double', NULL )).' AS post_order'.",\n"
-					 .$DB->quote(param( 'item_featured', 'integer', NULL )).' AS post_featured'."\n";
-		$this->total_rows = 1;
-		$this->total_pages = 1;
-		$this->page = 1;
-
-		// ATTENTION: we skip the parent on purpose here!! fp> refactor
-		DataObjectList2::query( false, false, false, 'PREVIEW QUERY' );
-
-		$Item = & $this->Cache->instantiate( $this->rows[0] );
+		// Get basic params:
+		param( 'post_category', 'integer', true );
+		param( 'post_extracats', 'array', array() );
+		param( 'post_status', 'string', 'published' );
+
+		// Make sure main cat is in extracat list and there are no duplicates:
+		$post_extracats[] = $post_category;
+		$post_extracats = array_unique( $post_extracats );
+		// Check permission on statuses:
+		$current_User->check_perm( 'cats_post!'.$post_status, 'edit', true, $post_extracats );
+
+		// Create new item:
+		$Item = new Item();
+
+		// Set the params we already got:
+		$Item->set( 'status', $post_status );
+		$Item->set( 'main_cat_ID', $post_category );
+		$Item->set( 'extra_cat_IDs', $post_extracats );
+		
+		// Set more params, just to be sure everything works.
+		$localtimenow_sql = date2mysql( $localtimenow );
+		$Item->set_param( 'datemodified', 'date', $localtimenow_sql );
+		$Item->set_param( 'datecreated', 'date', $localtimenow_sql );
+		// Pretend notifications are already done:
+		$Item->set( 'notifications_status', 'finished' );
+		
+		// Set user info:
+		$Item->set_creator_User( $current_User );
+		$Item->set( 'lastedit_user_ID', $current_User->ID );
+
+		// Load all the other params (from the form):
+		$Item->load_from_Request();
 
 		// Trigger plugin event, allowing to manipulate or validate the item before it gets previewed
 		$Plugins->trigger_event( 'AppendItemPreviewTransact', array( 'Item' => & $Item ) );
 
 		if( $errcontent = $Messages->display( T_('Invalid post, please correct these errors:'), '', false, 'error' ) )
-		{
-			$Item->content = $errcontent."\n<hr />\n".$content;
+		{	// There have been errors:
+			$Item->content = $errcontent."\n<hr />\n".$Item->content;
 		}
 
 		// little funky fix for IEwin, rawk on that code
@@ -215,6 +137,20 @@
 		{ // QUESTION: Is this still needed? What about $IEWin_bookmarklet_fix? (blueyed)
 			$Item->content = preg_replace('/\%u([0-9A-F]{4,4})/e', "'&#'.base_convert('\\1',16,10). ';'", $Item->content);
 		}
+
+		// Add the forged Item to the cache:
+		$this->Cache->add( $Item );
+
+		// The really ugly code starts here -- we are going to add a fake row
+		// to accommodate DateObjectList2::get_by_idx().
+		// First, increase number of rows:
+		$this->result_num_rows++;
+
+		// Now create the fake row. It only contains the item ID.
+		$fake_row = new stdClass();
+		$fake_row->post_ID = 0;
+
+		$this->rows[] = & $fake_row;
 	}
 
 

=== modified file 'inc/items/views/_item_expert.form.php'
--- inc/items/views/_item_expert.form.php	2010-02-19 10:50:37 +0000
+++ inc/items/views/_item_expert.form.php	2010-04-19 16:19:23 +0000
@@ -82,7 +82,6 @@
 // In case we send this to the blog for a preview :
 $Form->hidden( 'preview', 1 );
 $Form->hidden( 'more', 1 );
-$Form->hidden( 'preview_userid', $current_User->ID );
 ?>
 
 <div class="left_col">