[Phpbb-checkins] CVS: phpBB2 modcp.php,1.71.2.4,1.71.2.5 posting.php,1.159.2.4,1.159.2.5

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv4429

Modified Files:
      Tag: phpBB-2_0_0
	modcp.php posting.php 
Log Message:
Various updates

Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.71.2.4
retrieving revision 1.71.2.5
diff -C2 -r1.71.2.4 -r1.71.2.5
*** modcp.php	13 May 2002 13:18:17 -0000	1.71.2.4
--- modcp.php	19 May 2002 15:02:08 -0000	1.71.2.5
***************
*** 72,76 ****
  // Continue var definitions
  //
! $start = ( isset($HTTP_GET_VARS['start']) ) ? $HTTP_GET_VARS['start'] : 0;
  
  $delete = ( isset($HTTP_POST_VARS['delete']) ) ? TRUE : FALSE;
--- 72,76 ----
  // Continue var definitions
  //
! $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
  
  $delete = ( isset($HTTP_POST_VARS['delete']) ) ? TRUE : FALSE;

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.159.2.4
retrieving revision 1.159.2.5
diff -C2 -r1.159.2.4 -r1.159.2.5
*** posting.php	12 May 2002 15:57:46 -0000	1.159.2.4
--- posting.php	19 May 2002 15:02:08 -0000	1.159.2.5
***************
*** 31,36 ****
  // Check and set various parameters
  //
! $params = array('submit' => 'post', 'confirm' => 'confirm', 'preview' => 'preview', 'delete' => 'delete', 'poll_delete' => 'poll_delete', 'poll_add' => 'add_poll_option', 'poll_edit' => 'edit_poll_option', 'mode' => 'mode', 'forum_id' => POST_FORUM_URL, 'topic_id' => POST_TOPIC_URL, 'post_id' => POST_POST_URL);
! 
  while( list($var, $param) = @each($params) )
  {
--- 31,35 ----
  // Check and set various parameters
  //
! $params = array('submit' => 'post', 'confirm' => 'confirm', 'preview' => 'preview', 'delete' => 'delete', 'poll_delete' => 'poll_delete', 'poll_add' => 'add_poll_option', 'poll_edit' => 'edit_poll_option', 'mode' => 'mode');
  while( list($var, $param) = @each($params) )
  {
***************
*** 45,48 ****
--- 44,62 ----
  }
  
+ $params = array('forum_id' => POST_FORUM_URL, 'topic_id' => POST_TOPIC_URL, 'post_id' => POST_POST_URL);
+ while( list($var, $param) = @each($params) )
+ {
+ 	if ( !empty($HTTP_POST_VARS[$param]) || !empty($HTTP_GET_VARS[$param]) )
+ 	{
+ 		$$var = ( !empty($HTTP_POST_VARS[$param]) ) ? intval($HTTP_POST_VARS[$param]) : intval($HTTP_GET_VARS[$param]);
+ 	}
+ 	else
+ 	{
+ 		$$var = '';
+ 	}
+ }
+ 
+ 
+ 
  $refresh = $preview || $poll_add || $poll_edit || $poll_delete;
  
***************
*** 535,539 ****
  				submit_post($mode, $post_data, $return_message, $return_meta, $forum_id, $topic_id, $post_id, $poll_id, $topic_type, $bbcode_on, $html_on, $smilies_on, $attach_sig, $bbcode_uid, str_replace("\'", "''", $username), str_replace("\'", "''", $subject), str_replace("\'", "''", $message), str_replace("\'", "''", $poll_title), $poll_options, $poll_length);
  				if ( $error_msg == '' )
! 				user_notification($mode, $post_data, $forum_id, $topic_id, $post_id, $notify_user);
  			}
  			break;
--- 549,555 ----
  				submit_post($mode, $post_data, $return_message, $return_meta, $forum_id, $topic_id, $post_id, $poll_id, $topic_type, $bbcode_on, $html_on, $smilies_on, $attach_sig, $bbcode_uid, str_replace("\'", "''", $username), str_replace("\'", "''", $subject), str_replace("\'", "''", $message), str_replace("\'", "''", $poll_title), $poll_options, $poll_length);
  				if ( $error_msg == '' )
! 				{
! 					user_notification($mode, $post_data, $forum_id, $topic_id, $post_id, $notify_user);
! 				}
  			}
  			break;
***************
*** 570,574 ****
  
  		$template->assign_vars(array(
! 			"META" => $return_meta)
  		);
  		message_die(GENERAL_MESSAGE, $return_message);
--- 586,590 ----
  
  		$template->assign_vars(array(
! 			'META' => $return_meta)
  		);
  		message_die(GENERAL_MESSAGE, $return_message);