xoops-cvs2

[<on...@us...>]

Update of /cvsroot/xoops/xoops-current/html/modules/news
In directory usw-pr-cvs1:/tmp/cvs-serv31224

Modified Files:
	submit.php 
Log Message:
no message

Index: submit.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/news/submit.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** submit.php	11 Sep 2002 12:21:06 -0000	1.2
--- submit.php	26 Sep 2002 17:29:37 -0000	1.3
***************
*** 46,57 ****
  		OpenTable();
  		$p_subject = $myts->makeTboxData4Preview($HTTP_POST_VARS['subject']);
!   		if ( !empty($HTTP_POST_VARS['nosmiley']) && !empty($HTTP_POST_VARS['nohtml']) ){
  			$p_message = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,0,1);
- 		} elseif ( !empty($HTTP_POST_VARS['nohtml']) ) {
- 			$p_message = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,1,1);
- 		} elseif ( !empty($HTTP_POST_VARS['nosmiley']) ) {
- 			$p_message = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],1,0,1);
  		} else {
! 			$p_message = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],1,1,1);
  		}
  		$subject = $myts->makeTboxData4PreviewInForm($HTTP_POST_VARS['subject']);
--- 46,53 ----
  		OpenTable();
  		$p_subject = $myts->makeTboxData4Preview($HTTP_POST_VARS['subject']);
!   		if ( !empty($HTTP_POST_VARS['nosmiley']) ) {
  			$p_message = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,0,1);
  		} else {
! 			$p_message = $myts->makeTareaData4Preview($HTTP_POST_VARS['message'],0,1,1);
  		}
  		$subject = $myts->makeTboxData4PreviewInForm($HTTP_POST_VARS['subject']);
***************
*** 59,63 ****
  		$noname = intval($HTTP_POST_VARS['noname']);
  		$nosmiley = intval($HTTP_POST_VARS['nosmiley']);
! 		$nohtml = intval($HTTP_POST_VARS['nohtml']);
  		$notifypub = intval($HTTP_POST_VARS['notifypub']);
  		echo "<b>"._NW_SUBMITNEWS."</b><br><br>";
--- 55,59 ----
  		$noname = intval($HTTP_POST_VARS['noname']);
  		$nosmiley = intval($HTTP_POST_VARS['nosmiley']);
! 		$nohtml = 1;
  		$notifypub = intval($HTTP_POST_VARS['notifypub']);
  		echo "<b>"._NW_SUBMITNEWS."</b><br><br>";
***************
*** 88,92 ****
  		$story->setTopicId($HTTP_POST_VARS['topic_id']);
  		$story->setHostname($GLOBALS['REMOTE_ADDR']);
! 		$story->setNohtml($HTTP_POST_VARS['nohtml']);
  		$story->setNosmiley($HTTP_POST_VARS['nosmiley']);
  		$story->setNotifyPub($HTTP_POST_VARS['notifypub']);
--- 84,88 ----
  		$story->setTopicId($HTTP_POST_VARS['topic_id']);
  		$story->setHostname($GLOBALS['REMOTE_ADDR']);
! 		$story->setNohtml(1);
  		$story->setNosmiley($HTTP_POST_VARS['nosmiley']);
  		$story->setNotifyPub($HTTP_POST_VARS['notifypub']);