[mxbb-commits] mx_news/mx_news/modules mx_news_main.php, 1.2, 1.3 mx_news_post_comment.php, 1.3, 1.4

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_news/mx_news/modules
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2452/modules

Modified Files:
	mx_news_main.php mx_news_post_comment.php 
Log Message:
Now virtual page compatible
Lots of code cleanup

Index: mx_news_post_comment.php
===================================================================
RCS file: /cvsroot/mxbb/mx_news/mx_news/modules/mx_news_post_comment.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mx_news_post_comment.php	16 Feb 2008 00:14:04 -0000	1.3
--- mx_news_post_comment.php	14 Mar 2008 20:42:38 -0000	1.4
***************
*** 42,58 ****
  		$cid = $mx_request_vars->request('cid', MX_TYPE_INT, 0);
  
- 		/*
- 		if ( $mx_request_vars->is_request('item_id') && $mx_request_vars->is_request('cat_id') )
- 		{
- 			$item_id = $mx_request_vars->request('item_id', MX_TYPE_INT, 0);
- 			$cat_id = $mx_request_vars->request('cat_id', MX_TYPE_INT, 0);
- 		}
- 		else
- 		{
- 			mx_message_die( GENERAL_MESSAGE, $lang['Link_not_exist'] );
- 		}
- 		*/
- 
  		$item_id = $this->block_id;
  
  		$delete = $mx_request_vars->request('delete', MX_TYPE_NO_TAGS, '');
--- 42,47 ----
  		$cid = $mx_request_vars->request('cid', MX_TYPE_INT, 0);
  
  		$item_id = $this->block_id;
+ 		$virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, 0);
  
  		$delete = $mx_request_vars->request('delete', MX_TYPE_NO_TAGS, '');
***************
*** 60,81 ****
  		$preview = $mx_request_vars->is_request('preview');
  
- 		/*
- 		$sql = "SELECT *
- 			FROM " . LINKS_TABLE . "
- 			WHERE link_id = '" . $item_id . "'";
- 
- 		if ( !( $result = $db->sql_query( $sql ) ) )
- 		{
- 			mx_message_die( GENERAL_ERROR, 'Couldnt select download', '', __LINE__, __FILE__, $sql );
- 		}
- 
- 		if ( !$link_data = $db->sql_fetchrow( $result ) )
- 		{
- 			mx_message_die( GENERAL_MESSAGE, $lang['Link_not_exsist'] );
- 		}
- 
- 		$db->sql_freeresult( $result );
- 		*/
- 
  		$item_data = array();
  		$item_data['link_catid'] = $item_id;
--- 49,52 ----
***************
*** 213,229 ****
  		if ( $delete == 'do' )
  		{
- 			/*
- 			$sql = 'SELECT *
- 				FROM ' . LINKS_TABLE . "
- 				WHERE link_id = $item_id";
- 
- 			if ( !( $result = $db->sql_query( $sql ) ) )
- 			{
- 				mx_message_die( GENERAL_ERROR, 'Couldn\'t get article info', '', __LINE__, __FILE__, $sql );
- 			}
- 			$link_info = $db->sql_fetchrow( $result );
- 			*/
- 
- 			//if ( ( $this->auth_user[$link_info['link_catid']]['auth_delete_comment'] && $link_info['article_author_id'] == $userdata['user_id'] ) || $this->auth_user[$link_info['link_catid']]['auth_mod'] )
  			if ( $mx_block->auth_edit || $mx_block->auth_mod ) // Maybe too nice...
  			{
--- 184,187 ----
***************
*** 270,274 ****
  			$this->update_add_comment_notify($this->block_id, $news_post_mode);
  
! 			$message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( 'mode=main&k=' . $item_id ) ) . '">', '</a>' );
  			mx_message_die( GENERAL_MESSAGE, $message );
  		}
--- 228,232 ----
  			$this->update_add_comment_notify($this->block_id, $news_post_mode);
  
! 			$message = $lang['Comment_posted'] . '<br /><br />' . sprintf( $lang['Click_return'], '<a href="' . mx_append_sid( $this->this_mxurl( 'mode=main&k=' . $item_id . '&virtual=' . $virtual_id) ) . '">', '</a>' );
  			mx_message_die( GENERAL_MESSAGE, $message );
  		}
***************
*** 325,328 ****
--- 283,287 ----
  		{
  			$hidden_form_fields = '<input type="hidden" name="action" value="post_news">
+ 						<input type="hidden" name="virtual" value="' . $virtual_id . '">
  						<input type="hidden" name="item_id" value="' . $item_id . '">
  						<input type="hidden" name="cid" value="' . $mx_request_vars->request('cid', MX_TYPE_INT, '') . '">
***************
*** 338,341 ****
--- 297,301 ----
  
  			$hidden_form_fields = '<input type="hidden" name="action" value="post_news">
+ 						<input type="hidden" name="virtual" value="' . $virtual_id . '">
  						<input type="hidden" name="item_id" value="' . $item_id . '">
  						<input type="hidden" name="comment" value="post">';

Index: mx_news_main.php
===================================================================
RCS file: /cvsroot/mxbb/mx_news/mx_news/modules/mx_news_main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mx_news_main.php	15 Feb 2008 22:29:30 -0000	1.2
--- mx_news_main.php	14 Mar 2008 20:42:38 -0000	1.3
***************
*** 35,39 ****
  		// =======================================================
  		$start = $mx_request_vars->get('start', MX_TYPE_INT, 0);
- 		//$link_id = $mx_request_vars->request('link_id', MX_TYPE_INT, '');
  		$block_id = $this->block_id;
  		$page_num = $mx_request_vars->request('page_num', MX_TYPE_INT, 1) - 1;
--- 35,38 ----
***************
*** 47,52 ****
  		// Comments
  		//
- 		//if ( $this->auth_user[$link_data['link_catid']]['auth_view_comment'])
- 		//{
  			$comments_type = $this->comments[$block_id]['internal_comments'] ? 'internal' : 'phpbb';
  
--- 46,49 ----
***************
*** 58,62 ****
  			$mx_news_comments->init( $mx_news_data, $comments_type );
  			$mx_news_comments->display_comments();
- 		//}
  
  		//
--- 55,58 ----